moparisthebest
/
Conversations
mirror of https://github.com/moparisthebest/Conversations
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into development

This commit is contained in:
Daniel Gultsch 2015-08-23 18:06:40 +02:00
parent 7bd0f31244 b1f1a99190
commit 412efe93c0
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,5 +1,8 @@
###Changelog ###Changelog
####Version 1.6.2
* fixed issues with connection time out when server does not support ping
####Version 1.6.1 ####Version 1.6.1
* fixed crashes * fixed crashes

2
build.gradle
View File

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