aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-08-23 18:06:40 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-08-23 18:06:40 +0200
commit412efe93c0988e3a130bac35802fca139787d68a (patch)
tree882a7facc8121c3b856a54f345f8bd932aed37cc
parent7bd0f312446fb74b480becb9b3b05cee446e5752 (diff)
parentb1f1a991906cd28ffb0c6e5a199872a1f508939a (diff)
Merge branch 'master' into development
-rw-r--r--CHANGELOG.md3
-rw-r--r--build.gradle2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f081319..279fada1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
###Changelog
+####Version 1.6.2
+* fixed issues with connection time out when server does not support ping
+
####Version 1.6.1
* fixed crashes
diff --git a/build.gradle b/build.gradle
index 09ea1f6a..c5fb8381 100644
--- a/build.gradle
+++ b/build.gradle
@@ -48,7 +48,7 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 21
- versionCode 85
+ versionCode 86
versionName "1.7.0-alpha"
}