From 107ab85a22bda92d7cb1d10ea2494c7280bccf67 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 29 May 2016 13:09:15 +0200
Subject: [PATCH] version bump to 1.12.5 + changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02fb9280f..779d4f33b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ###Changelog
 
+####Version 1.12.5
+* new create conference dialog
+* show first unread message on top
+* show geo uri as links
+* circumvent long message DOS
+
 ####Version 1.12.4
 * show offline members in conference (needs server support)
 * various bug fixes
diff --git a/build.gradle b/build.gradle
index 74b98a166..dc0dde1e4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,8 +54,8 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 23
-		versionCode 145
-		versionName "1.12.4"
+		versionCode 146
+		versionName "1.12.5"
 		archivesBaseName += "-$versionName"
 		applicationId "eu.siacs.conversations"
 	}