From 018f978a22b7314b21b83c40d8741a811ffc55bf Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 13 May 2016 12:01:07 +0200
Subject: [PATCH] version bump to 1.12.3 + changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 535097701..ca525a6d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ###Changelog
 
+####Version 1.12.3
+* make omemo default when all resources support it
+* show presence of other resources as template
+* start typing in StartConversationsActivity to search
+* various bug fixes and improvements
+
 ####Version 1.12.2
 * fixed pgp presence signing
 
diff --git a/build.gradle b/build.gradle
index 281da89e4..1a1474d64 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,8 +54,8 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 23
-		versionCode 143
-		versionName "1.12.2"
+		versionCode 144
+		versionName "1.12.3"
 		archivesBaseName += "-$versionName"
 		applicationId "eu.siacs.conversations"
 	}