diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-07-31 10:22:02 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-07-31 10:22:02 +0200 |
| commit | e3cec50d1f5412cf0da4d00476e2f49b7059fd69 (patch) | |
| tree | 69ebf634409c013f542d85def17d547f8bafe173 /AndroidManifest.xml | |
| parent | 3d9eb0e8fe128e0e9ddbf153475c0684d3d1d08a (diff) | |
| parent | 9b34f39cd2f08506b9e6be481bd7e0b013a9a11a (diff) | |
Merge branch 'master' into development
Conflicts:
AndroidManifest.xml
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 53452398..f00c88a5 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="eu.siacs.conversations" - android:versionCode="23" + android:versionCode="24" android:versionName="0.6-alpha" > <uses-sdk |