diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-05-17 19:33:55 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-05-17 19:33:55 +0200 |
| commit | c07d3deea344c91bfea11fb7f2e37bc4172968e7 (patch) | |
| tree | fe9a0acd0fbd30d37c561f0dcc55d99995a1824e | |
| parent | 736e09fbb56fbdc4aca4e9bdc9875a5df60cb562 (diff) | |
| parent | ae6c99012e4f26ec109233e4d29f4bd0c1eca5ea (diff) | |
Merge branch 'master' into development
| -rw-r--r-- | AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | CHANGELOG.md | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4806ac32..32e83085 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="13" - android:versionName="0.2.2" > + android:versionCode="14" + android:versionName="0.2.3" > <uses-sdk android:minSdkVersion="14" diff --git a/CHANGELOG.md b/CHANGELOG.md index f24146ee..7e9aa5cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ###Changelog +####Version 0.2.3 +* regression fix with receiving encrypted images + ####Version 0.2.2 * Ability to take photos directly * Improved openPGP offline handling |