From 3be95cd7bafdefc33b0f7fa9869534fa1d1d887b Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 23 Mar 2018 12:11:36 +0100
Subject: [PATCH] version bump to 2.0.0 + modified changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 101da2427..c353b3049 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 * Removed slide out panel for conversation overview
 * Add ability to change status message
 * Highlight irregular unicode code blocks in Jabber IDs
+* Conversations now requires Android 4.4+
 
 ### Version 1.23.8
 * bug fixes
diff --git a/build.gradle b/build.gradle
index 4f34ce3c2..8712e5d03 100644
--- a/build.gradle
+++ b/build.gradle
@@ -70,8 +70,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 25
-        versionCode 260
-        versionName "2.0.0-rc.1"
+        versionCode 261
+        versionName "2.0.0"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId