From bfe01c432244e04daf6804d5cfc3b838ea247c4b Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 14 Apr 2016 23:13:44 +0200
Subject: [PATCH] version bump to 1.11.7 + changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 683b8d739..ed65a8d5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ###Changelog
 
+####Version 1.11.7
+* Share xmpp uri from conference details
+* add setting to allow quick sharing
+* various bug fixes
+
 ####Version 1.11.6
 * added preference to disable notification light
 * various bug fixes
diff --git a/build.gradle b/build.gradle
index a1d5710dc..cd1d71867 100644
--- a/build.gradle
+++ b/build.gradle
@@ -64,8 +64,8 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 23
-		versionCode 139
-		versionName "1.11.6"
+		versionCode 140
+		versionName "1.11.7"
 		archivesBaseName += "-$versionName"
 		applicationId "eu.siacs.conversations"
 	}