diff options
| author | lookshe <github@lookshe.org> | 2015-01-03 23:19:05 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2015-01-03 23:19:05 +0100 |
| commit | 95e2a539517c27b3235acd582f17968c8e301e81 (patch) | |
| tree | 213bbeed798751e949376d85f4d7d0bd30c5fbfa /src/main/AndroidManifest.xml | |
| parent | 48717dd7d37c066ab626fc626a2ced626ef21d42 (diff) | |
| parent | 4f4eff2353f4e359b5582c8e808a4e88631c3e74 (diff) | |
Merge branch 'master' of ssh://git.fucktheforce.de/conversations
Conflicts:
src/main/java/eu/siacs/conversations/Config.java
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
src/main/java/eu/siacs/conversations/utils/UIHelper.java
Diffstat (limited to 'src/main/AndroidManifest.xml')
| -rw-r--r-- | src/main/AndroidManifest.xml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 937b6813..f3d58d57 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -77,6 +77,12 @@ android:name=".ui.ChooseContactActivity" android:label="@string/title_activity_choose_contact" /> <activity + android:name=".ui.BlocklistActivity" + android:label="@string/title_activity_block_list" /> + <activity + android:name=".ui.ChangePasswordActivity" + android:label="@string/change_password_on_server" /> + <activity android:name=".ui.ManageAccountActivity" android:configChanges="orientation|screenSize" android:label="@string/title_activity_manage_accounts" /> @@ -114,7 +120,7 @@ <category android:name="android.intent.category.DEFAULT" /> - <data android:mimeType="image/*" /> + <data android:mimeType="*/*" /> </intent-filter> </activity> <activity |