From 68a550de50adb8616ef72883ecfe33f17f44468a Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 1 May 2018 12:55:34 +0200
Subject: [PATCH] version bump to 2.2.0-beta + changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbd6412f8..b50278641 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+### Version 2.2.0
+* Integrate Voice Recorder
+* Integrate Share Location
+* Added ability to search messages
+
 ### Version 2.1.4
 * bug fixes
 
diff --git a/build.gradle b/build.gradle
index c7dd3f0e4..1648e9d79 100644
--- a/build.gradle
+++ b/build.gradle
@@ -66,8 +66,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 25
-        versionCode 268
-        versionName "2.1.4"
+        versionCode 269
+        versionName "2.2.0-beta"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId