diff options
| author | Michael <betheg@bitcloner.org> | 2014-08-30 14:00:53 +0200 |
|---|---|---|
| committer | Michael <betheg@bitcloner.org> | 2014-08-30 14:00:53 +0200 |
| commit | 969cba5ee6fa74460d85930a627a685cd6876ca3 (patch) | |
| tree | a681a9b365fc3de0b67ea43cf8ef3bcecfb60dd8 /AndroidManifest.xml | |
| parent | 3714947d5f9307b173fdaf7b0fc08d92fd824553 (diff) | |
| parent | 9eafb1008676747a3ff315fb820178641c7b09f3 (diff) | |
Merge remote-tracking branch 'upstream/development' into fix_typo
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5133041b..786496a1 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="eu.siacs.conversations" - android:versionCode="24" - android:versionName="0.6-alpha" > + android:versionCode="26" + android:versionName="0.7-alpha" > <uses-sdk android:minSdkVersion="14" @@ -117,4 +117,4 @@ <activity android:name="de.duenndns.ssl.MemorizingActivity" /> </application> -</manifest>
\ No newline at end of file +</manifest> |