From 24cd08e55eb18381b5d0c1dd17b21b391a295064 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Mon, 16 Feb 2015 16:57:30 +0100
Subject: [PATCH] version bump to 1.0.4 and changelog

---
 CHANGELOG.md | 14 ++++++++++++++
 build.gradle |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98657b21f..16b53a3ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 ###Changelog
 
+####Version 1.0.4
+* load avatars asynchronously on start up
+* support for XEP-0092: Software Version
+
+####Version 1.0.3
+* load messages asynchronously on start up
+* bug fixes
+
+####Version 1.0.2
+* skipped
+
+####Version 1.0.1
+* accept more ciphers
+
 ####Version 1.0
 * MUC controls (Affiliaton changes)
 * Added download button to notification
diff --git a/build.gradle b/build.gradle
index 2032e4552..03fafaf91 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,8 +46,8 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 21
-		versionCode 48
-		versionName "1.0.3"
+		versionCode 49
+		versionName "1.0.4"
 	}
 
 	compileOptions {