diff options
| author | Michael <betheg@bitcloner.org> | 2014-08-29 23:30:47 +0200 |
|---|---|---|
| committer | Michael <betheg@bitcloner.org> | 2014-08-29 23:30:47 +0200 |
| commit | 3714947d5f9307b173fdaf7b0fc08d92fd824553 (patch) | |
| tree | 1257249aa0b0d017170bce7c9349f48cbe68af05 /AndroidManifest.xml | |
| parent | 98dabe9ab488ab92ff255cb04feaaddad6488c12 (diff) | |
| parent | 5450a2ae469a84f5c285aeaf68135684ad6aae27 (diff) | |
Merge remote-tracking branch 'upstream/development' into fix_typo
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a10a9cc5..5133041b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -93,7 +93,7 @@ </activity> <activity android:name="eu.siacs.conversations.ui.PublishProfilePictureActivity" - android:label="@string/publish_avatar" + android:label="@string/mgmt_account_publish_avatar" android:windowSoftInputMode="stateHidden" > </activity> <activity |