Merge branch 'master' into add-pin-conversation
This commit is contained in:
commit
e92943b167
47 changed files with 1604 additions and 23 deletions
|
|
@ -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"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue