From 678cc7af10b09dda31eb8a5ab9fb954e18ff5a35 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Sun, 22 Jun 2014 19:53:43 +0200
Subject: [PATCH] changelog and version bump to 0.4-beta

---
 AndroidManifest.xml | 4 ++--
 CHANGELOG.md        | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 97a27abb2..70d181549 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="16"
-    android:versionName="0.3" >
+    android:versionCode="17"
+    android:versionName="0.4-beta" >
 
     <uses-sdk
         android:minSdkVersion="14"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1db042182..5a7d9c63a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 ###Changelog
 
+####Version 0.4
+* OTR file encryption
+* keep OTR messages and files on device until both parties or online at the same time
+* XEP-0333. Mark wether the other party has read your messages
+* Delayed messages are now tagged properly
+* Share images from the Gallery
+* Infinit history scrolling
+* Mark the last used presence in presence selection dialog
+
 ####Version 0.3
 * Mostly bug fixes and internal rewrites
 * Touch contact picture in conference to highlight