Merge branch 'master' into feature/451-recycle-bin
This commit is contained in:
commit
b29d664dc4
71 changed files with 1263 additions and 201 deletions
|
|
@ -18,6 +18,11 @@
|
|||
android:showAsAction="never"
|
||||
android:title="Show recycle bin"
|
||||
app:showAsAction="never" />
|
||||
<item
|
||||
android:id="@+id/show_archived"
|
||||
android:showAsAction="never"
|
||||
android:title="@string/show_archived_conversations"
|
||||
app:showAsAction="never" />
|
||||
<item
|
||||
android:id="@+id/settings"
|
||||
android:icon="@drawable/ic_settings_cog_vector"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue