Merge branch 'master' into add-pin-conversation

This commit is contained in:
Tibor Kaputa 2021-09-24 18:34:15 +02:00 committed by GitHub
commit e92943b167
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
47 changed files with 1604 additions and 23 deletions

View file

@ -6,6 +6,14 @@
android:icon="@drawable/ic_search_vector"
android:title="@string/search"
app:showAsAction="always" />
<item
android:id="@+id/import_messages"
android:title="@string/import_messages"
app:showAsAction="never" />
<item
android:id="@+id/export_messages"
android:title="@string/export_messages"
app:showAsAction="never" />
<item
android:id="@+id/settings"
android:title="@string/settings"