From 94ee4d48c679d228e88f7d40704a5574f7ec9d54 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 8 Dec 2019 12:02:20 +0100
Subject: [PATCH] version bump to 2.6.1 + changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98f7cb83d..ff2b7b07b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+### Version 2.6.1
+* fixes for Jingle IBB file transfer
+* fixes for repeated corrections filling up the database
+* switched to Last Message Correction v1.1
+
 ### Version 2.6.0
 * Introduce expert setting to perform channel discovery on local server instead of [search.jabber.network](https://search.jabber.network)
 * Enable delivery check marks by default and remove setting
diff --git a/build.gradle b/build.gradle
index 59f6a627d..2275c90aa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -84,8 +84,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 349
-        versionName "2.6.0"
+        versionCode 351
+        versionName "2.6.1"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId