Merge branch 'main' into develop

This commit is contained in:
Thomas 2022-07-30 18:55:11 +02:00
commit efe387088e
2 changed files with 3 additions and 2 deletions

View file

@ -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"

View file

@ -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">