diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-11-15 15:50:35 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-11-15 15:50:35 +0100 |
| commit | 5b9c690c47cbb6fd352d7ddce3b13e6bf119fc22 (patch) | |
| tree | d6f19365a8a72d1f711e3d4055d354d16fe5bcaf /src/main/AndroidManifest.xml | |
| parent | 4c504dea7ac7b0413df89ec630408b91f4abddb4 (diff) | |
| parent | f1e2be4096d1c023adc2c9eec49bcf64b9a453de (diff) | |
Merge branch 'feature/otr_verification' into development
Diffstat (limited to '')
| -rw-r--r-- | src/main/AndroidManifest.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 30622887..937b6813 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -96,6 +96,10 @@ android:label="@string/mgmt_account_publish_avatar" android:windowSoftInputMode="stateHidden" /> <activity + android:name=".ui.VerifyOTRActivity" + android:label="@string/verify_otr" + android:windowSoftInputMode="stateHidden" /> + <activity android:name=".ui.ShareWithActivity" android:label="@string/title_activity_conversations" > <intent-filter> |