Merge remote-tracking branch 'upstream/master' into try-to-merge-upstream

This commit is contained in:
sk
2023-09-29 20:59:12 +02:00
99 changed files with 1804 additions and 177 deletions

View File

@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/pin"
android:title="@string/sk_pin_timeline"
android:icon="@drawable/ic_fluent_pin_24_regular"
android:showAsAction="always" />
<item
android:id="@+id/pin"
android:title="@string/sk_pin_timeline"
android:showAsAction="always"
android:icon="@drawable/ic_fluent_pin_24_regular" />
<item
android:id="@+id/follow_hashtag"
android:icon="@drawable/ic_fluent_person_add_24_regular"
android:showAsAction="always"
android:title="@string/button_follow"/>
</menu>