mirror of
https://codeberg.org/tom79/Fedilab.git
synced 2024-12-23 01:00:04 +02:00
Merge branch 'main' into develop
This commit is contained in:
commit
efe387088e
2 changed files with 3 additions and 2 deletions
|
@ -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"
|
||||
|
|
|
@ -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">
|
||||
|
|
Loading…
Reference in a new issue