Merge branch 'master' into feature/451-recycle-bin
This commit is contained in:
commit
b29d664dc4
71 changed files with 1263 additions and 201 deletions
|
|
@ -58,6 +58,13 @@
|
|||
android:label="@string/recycle_bin"
|
||||
android:parentActivityName=".activities.MainActivity" />
|
||||
|
||||
<activity
|
||||
android:name=".activities.ArchivedConversationsActivity"
|
||||
android:configChanges="orientation"
|
||||
android:exported="true"
|
||||
android:label="@string/archived_conversations"
|
||||
android:parentActivityName=".activities.MainActivity" />
|
||||
|
||||
<activity
|
||||
android:name=".activities.ThreadActivity"
|
||||
android:configChanges="orientation"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue