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 | |
| parent | 3d9eb0e8fe128e0e9ddbf153475c0684d3d1d08a (diff) | |
| parent | 9b34f39cd2f08506b9e6be481bd7e0b013a9a11a (diff) | |
Merge branch 'master' into development
Conflicts:
AndroidManifest.xml
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | CHANGELOG.md | 5 |
2 files changed, 5 insertions, 2 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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d4db4d5..37e3c920 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ ###Changelog -###Version 0.5.1 +####Version 0.5.2 +* minor bug fixes + +####Version 0.5.1 * couple of small bug fixes that have been missed in 0.5 * complete translations for Swedish, Dutch, German, Spanish, French, Russian |