Merge branch 'master' into feature/451-recycle-bin
This commit is contained in:
commit
dbf582b239
33 changed files with 570 additions and 590 deletions
|
|
@ -3,16 +3,6 @@
|
|||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
tools:ignore="AppCompatResource,AlwaysShowAction">
|
||||
<item
|
||||
android:id="@+id/import_messages"
|
||||
android:showAsAction="never"
|
||||
android:title="@string/import_messages"
|
||||
app:showAsAction="never" />
|
||||
<item
|
||||
android:id="@+id/export_messages"
|
||||
android:showAsAction="never"
|
||||
android:title="@string/export_messages"
|
||||
app:showAsAction="never" />
|
||||
<item
|
||||
android:id="@+id/show_recycle_bin"
|
||||
android:showAsAction="never"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue