From 43254663fbdef2ac041d1d48fcb8a48d90e9e868 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 3 May 2019 10:49:46 +0200
Subject: [PATCH] version bump to 2.5.1 + changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfc89dc90..f4b42603c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### Version 2.5.1
+* minor bug fixes
+* Set own OMEMO devices to inactive after not seing them for 14 days. (was 7 days)
+
 ### Version 2.5.0
 * Added channel search via search.jabbercat.org
 * Reworked onboarding screens
diff --git a/build.gradle b/build.gradle
index ef1dd74af..a191d6e8e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -81,8 +81,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 326
-        versionName "2.5.0"
+        versionCode 327
+        versionName "2.5.1"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId