diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-11-16 12:27:17 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-11-16 12:27:17 +0100 |
| commit | d43aeb721835e43a15e3496b3c06dda54d516d76 (patch) | |
| tree | 686c80b7315d25e3d72b92b1c5daf858fc114185 | |
| parent | ac8c2b7e62343fdaaff3b018cb187962a655acf5 (diff) | |
| parent | 279534ddb485007721d43751408fae42cd98b955 (diff) | |
Merge branch 'master' into development
Conflicts:
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | build.gradle | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 99054533..db4f687b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ###Changelog +####Version 0.8.4 +* bug fixes + ####Version 0.8.3 * increased UI performance * fixed rotation bugs diff --git a/build.gradle b/build.gradle index 84a79d07..32ea3546 100644 --- a/build.gradle +++ b/build.gradle @@ -46,8 +46,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 19 - versionCode 35 - versionName "0.8.3" + versionCode 36 + versionName "0.8.4" } compileOptions { |