From abdb8bfb65cda02adcb6c1bcbdcd00159fc0c96a Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 4 Jan 2016 17:36:46 +0100
Subject: [PATCH] version bump to 1.8.4 and changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ebd84d945..d32318290 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ###Changelog
 
+####Versin 1.8.4
+* prompt to trust own OMEMO devices
+* fixed rotation issues in avatar publication
+* invite non-contact JIDs to conferences
+
 ####Version 1.8.3
 * brought text selection back
 
diff --git a/build.gradle b/build.gradle
index d74b1a40b..a70f278ec 100644
--- a/build.gradle
+++ b/build.gradle
@@ -53,8 +53,8 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 23
-		versionCode 114
-		versionName "1.8.3"
+		versionCode 115
+		versionName "1.8.4"
 		project.ext.set(archivesBaseName, archivesBaseName + "-" + versionName);
 	}