From b4ad2de2e5a3e8da72f2cab733e255e1a48f9e4b Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 5 Apr 2016 23:10:55 +0200
Subject: version bump to 1.11.4 + changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85e7c5eec..cf3cb307d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ###Changelog
 
+####Version 1.11.4
+* fixed a bug where contacts are shown as offline
+* improved broken PEP detection
+
 ####Version 1.11.3
 * check maximum file size when using HTTP Upload
 * properly calculate caps hash
diff --git a/build.gradle b/build.gradle
index 5a05e95be..b1570f1db 100644
--- a/build.gradle
+++ b/build.gradle
@@ -64,8 +64,8 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 23
-		versionCode 135
-		versionName "1.11.3"
+		versionCode 136
+		versionName "1.11.4"
 		archivesBaseName += "-$versionName"
 		applicationId "eu.siacs.conversations"
 	}
-- 
cgit v1.2.3


From 275d6a858c47031319f607268b5f37421be3455e Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 6 Apr 2016 21:33:32 +0200
Subject: tell people to build debug instead of release

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ee7caeba5..7e2d954c7 100644
--- a/README.md
+++ b/README.md
@@ -334,7 +334,7 @@ Make sure to have ANDROID_HOME point to your Android SDK. Use the Android SDK Ma
 
     git clone https://github.com/siacs/Conversations.git
     cd Conversations
-    ./gradlew assembleFreeRelease
+    ./gradlew assembleFreeDebug
 
 There are two build flavors available. *free* and *playstore*. Unless you know what you are doing you only need *free*.
 
-- 
cgit v1.2.3