aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-05-13 17:57:10 +0200
committerDaniel Gultsch <daniel@gultsch.de>2014-05-13 17:57:10 +0200
commitbc87f596006fb25ca9457268b1a3290ca733df89 (patch)
tree353497f27d265d19414eef0755707a2a180fe7ee
parenta3d241020ac69db59b29623732751f5934cf356f (diff)
version bump0.2.1
-rw-r--r--AndroidManifest.xml4
-rw-r--r--CHANGELOG.md4
2 files changed, 6 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8c90d092..3d1d6a4f 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="11"
- android:versionName="0.2" >
+ android:versionCode="12"
+ android:versionName="0.2.1" >
<uses-sdk
android:minSdkVersion="14"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ecfd13f5..116cc307 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
###Changelog
+####Version 0.2.1
+* Various bug fixes
+* Updated Translations
+
####Version 0.2
* Image file transfer
* Better integration with OpenKeychain (PGP encryption)