From becc3eb8676ae3fddc912e0701b7ce174da394b3 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 3 Jun 2016 23:57:18 +0200
Subject: [PATCH] version bump to 1.12.9 + changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b671f6e17..8b6d19784 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ###Changelog
 
+####Version 1.12.9
+* make grace period configurable
+
 ####Version 1.12.8
 * more bug fixes :-(
 
diff --git a/build.gradle b/build.gradle
index 4ba719c45..a9552d283 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,8 +54,8 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 23
-		versionCode 149
-		versionName "1.12.8"
+		versionCode 151
+		versionName "1.12.9"
 		archivesBaseName += "-$versionName"
 		applicationId "eu.siacs.conversations"
 	}