Merge branch 'master' into donations

# Conflicts:
#	mastodon/src/main/res/values/strings.xml
This commit is contained in:
Grishka
2024-05-21 20:08:43 +03:00
6 changed files with 63 additions and 18 deletions

View File

@@ -141,6 +141,7 @@
android:layout_marginHorizontal="16dp"
android:textAppearance="@style/m3_body_large"
android:textColor="?colorM3OnSurface"
android:textIsSelectable="true"
tools:text="A cute black cat"/>
</LinearLayout>