From b3d4d0608f825d6cb92551340b83cd9b1dada760 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 27 Apr 2017 17:27:39 +0200
Subject: [PATCH] version bump to 1.18.3 + changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6585cc658..e9e3555a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ###Changelog
 
+####Version 1.18.3
+* limited GPG encryption for MUC offline members
+
 ####Version 1.18.2
 * added support for Android Auto
 * fixed HTTP Download over Tor
diff --git a/build.gradle b/build.gradle
index 3f0286214..ff5a8c669 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,10 +23,10 @@ configurations {
 
 dependencies {
     compile project(':libs:MemorizingTrustManager')
-    playstoreCompile 'com.google.android.gms:play-services-gcm:10.0.1'
+    playstoreCompile 'com.google.android.gms:play-services-gcm:10.2.1'
     compile 'org.sufficientlysecure:openpgp-api:10.0'
     compile 'com.soundcloud.android:android-crop:1.0.1@aar'
-    compile 'com.android.support:support-v13:25.1.1'
+    compile 'com.android.support:support-v13:25.3.1'
     compile 'org.bouncycastle:bcprov-jdk15on:1.52'
     compile 'org.bouncycastle:bcmail-jdk15on:1.52'
     compile 'org.jitsi:org.otr4j:0.22'
@@ -56,8 +56,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 25
-        versionCode 211
-        versionName "1.18.2"
+        versionCode 212
+        versionName "1.18.3"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
     }