diff options
| author | kruks23 <scardenas@openmailbox.org> | 2014-07-10 15:13:31 +0200 |
|---|---|---|
| committer | kruks23 <scardenas@openmailbox.org> | 2014-07-10 15:13:31 +0200 |
| commit | 8379f695166ee9888e6e1221894c7d1494669a6d (patch) | |
| tree | b43c4b4fe72916df1dd547ab706ffae34cdcd243 /AndroidManifest.xml | |
| parent | c7088489bd339e4b8b5128e909a1b4377864a5c9 (diff) | |
| parent | e97b5244552c8da06b3311bccb831be30c9a641a (diff) | |
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4feb3a3d..e242c3e3 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -48,6 +48,12 @@ <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> </activity> + <activity + android:name="eu.siacs.conversations.ui.StartConversation" + android:label="@string/title_activity_start_conversation" + android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity" + android:logo="@drawable/ic_activity" + ></activity> <activity android:name="eu.siacs.conversations.ui.SettingsActivity" android:label="@string/title_activity_settings" |