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 /CHANGELOG.md | |
parent | ac8c2b7e62343fdaaff3b018cb187962a655acf5 (diff) | |
parent | 279534ddb485007721d43751408fae42cd98b955 (diff) |
Merge branch 'master' into development
Conflicts:
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
Diffstat (limited to '')
-rw-r--r-- | CHANGELOG.md | 3 |
1 files changed, 3 insertions, 0 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 |