From 5793fb680f1d318b6f5fdb3962ab1c884a9259ce Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Thu, 19 Mar 2015 19:40:42 +0100
Subject: [PATCH] version bump to 1.2.0-beta

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77a49e47e5d4bf3a906f6d302f3eb5cfaaf3a29a..dc62ffdeac528465b17f841c92af5ab2948f56f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,9 @@
 ###Changelog
 
 ####Version 1.2.0
-* Send current location (requires plugin)
+* Send current location (requires [plugin]https://play.google.com/store/apps/details?id=eu.siacs.conversations.sharelocation())
+* Invite multiple contacts at once
+* performance improvements
 * bug fixes
 
 ####Version 1.1.0
diff --git a/build.gradle b/build.gradle
index 2c23aad661bd736418a0a1d78501eb8e556dcf4a..7feadf236a5dbddb9c4afb30e99999cb30454870 100644
--- a/build.gradle
+++ b/build.gradle
@@ -43,8 +43,8 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 21
-		versionCode 53
-		versionName "1.1.0"
+		versionCode 54
+		versionName "1.2.0-beta"
 	}
 
 	compileOptions {