From 65b3655a8b7226c8f064256fa41460f9ccce4ce3 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 6 Apr 2017 14:05:50 +0200
Subject: [PATCH] version bump to 1.18.0 + changelog
---
CHANGELOG.md | 6 ++++++
build.gradle | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24211bdd..0e50dd37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
###Changelog
+####Version 1.18.0
+* Conversations <1.16.0 will be unable to receive OMEMO encrypted messages
+* OMEMO: put auth tag into key (verify auth tag as well)
+* offer to block entire domain in message from stranger snackbar
+* treat URL as file if URL is in oob or contains key
+
####Version 1.17.1
* Switch Aztec to QR for faster scans
* Fixed unread counter for image messages
diff --git a/build.gradle b/build.gradle
index d5f2d35e..96248b25 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,8 +56,8 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 25
- versionCode 205
- versionName "1.17.1"
+ versionCode 208
+ versionName "1.18.0"
archivesBaseName += "-$versionName"
applicationId "eu.siacs.conversations"
}