aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--AndroidManifest.xml4
-rw-r--r--CHANGELOG.md6
2 files changed, 8 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c7f564bc..ce0bd52f 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="9"
- android:versionName="0.1.3" >
+ android:versionCode="10"
+ android:versionName="0.2-alpha" >
<uses-sdk
android:minSdkVersion="14"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e352af59..fbb9576e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
###Changelog
+####Version 0.2
+* Image file transfer
+* Better integration with OpenKeychain (PGP encryption)
+* Nicer conversation tiles for conferences
+* A lot of bug fixes and code clean up
+
####Version 0.1.3
* Switched to minidns library to resolve SRV records
* Faster DNS in some cases