From 5eedce91f9d92e5139f13fddb57314570f42b9ad Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 2 Apr 2016 18:09:07 +0200
Subject: version bump to 1.11.3 and changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9b3881c..85e7c5ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ###Changelog
 
+####Version 1.11.3
+* check maximum file size when using HTTP Upload
+* properly calculate caps hash
+
 ####Version 1.11.2
 * only add image files to media scanner
 * allow to delete files
diff --git a/build.gradle b/build.gradle
index 662cb12a..bcdff444 100644
--- a/build.gradle
+++ b/build.gradle
@@ -58,8 +58,8 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 23
-		versionCode 134
-		versionName "1.11.2"
+		versionCode 135
+		versionName "1.11.3"
 		archivesBaseName += "-$versionName"
 		applicationId "eu.siacs.conversations"
 	}
-- 
cgit v1.2.3