Merge branch 'master' into development
Conflicts: src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
This commit is contained in:
commit
d43aeb7218
|
@ -1,5 +1,8 @@
|
|||
###Changelog
|
||||
|
||||
####Version 0.8.4
|
||||
* bug fixes
|
||||
|
||||
####Version 0.8.3
|
||||
* increased UI performance
|
||||
* fixed rotation bugs
|
||||
|
|
|
@ -46,8 +46,8 @@ android {
|
|||
defaultConfig {
|
||||
minSdkVersion 14
|
||||
targetSdkVersion 19
|
||||
versionCode 35
|
||||
versionName "0.8.3"
|
||||
versionCode 36
|
||||
versionName "0.8.4"
|
||||
}
|
||||
|
||||
compileOptions {
|
||||
|
|
Loading…
Reference in New Issue