Merge branch 'master' into development

Daniel Gultsch created

Change summary

CHANGELOG.md | 3 +++
build.gradle | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)

Detailed changes

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
 

build.gradle 🔗

@@ -48,7 +48,7 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 21
-		versionCode 85
+		versionCode 86
 		versionName "1.7.0-alpha"
 	}