Commit efe38708 authored by Thomas's avatar Thomas
Browse files

Merge branch 'main' into develop

parents fa6a4a92 83ad77f3

app/src/main/res/layout/fragment_slide_media.xml

+2 −1
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ 
    <androidx.core.widget.NestedScrollView

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:fillViewport="true">

        android:fillViewport="true"

        android:keepScreenOn="true">



        <RelativeLayout

            android:id="@+id/media_fragment_container"

app/src/main/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -829,7 +829,7 @@ 
        <item>Taqbaylit</item>

        <item>Català</item>

        <item>ślůnski</item>

        <item>Sarda</item>

        <item>Sardu</item>

    </string-array>



    <string-array name="SET_LED_COLOUR_VALUES" translatable="false">