From 5f5f4ca190d5aa0bfad9ec1e9905f5aa2c7129ed Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 9 Dec 2017 14:49:30 +0100
Subject: [PATCH] version bump to 1.23.1 + changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae1c14b08..fb9486410 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### Version 1.23.1
+* Show icon instead of image preview in conversation overview
+* fixed loop when trying to decrypt with YubiKey
+
 ### Version 1.23.0
 * Support for read markers in private, non-anonymous group chats
 
diff --git a/build.gradle b/build.gradle
index d7515b4f9..a9ca15866 100644
--- a/build.gradle
+++ b/build.gradle
@@ -50,6 +50,7 @@ dependencies {
     compile 'com.makeramen:roundedimageview:2.3.0'
     compile "com.wefika:flowlayout:0.4.1"
     compile 'net.ypresto.androidtranscoder:android-transcoder:0.2.0'
+
 }
 
 ext {
@@ -64,8 +65,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 25
-        versionCode 242
-        versionName "1.23.0"
+        versionCode 245
+        versionName "1.23.1"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
     }