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

Merge branch 'master' into development 

Conflicts:
	src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
This commit is contained in:
iNPUTmice 2014-11-16 12:27:17 +01:00
parent ac8c2b7e62 279534ddb4
commit d43aeb7218
2 changed files with 5 additions and 2 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
####Version 0.8.4
* bug fixes
####Version 0.8.3
* increased UI performance
* fixed rotation bugs

4
build.gradle
View File

@ -46,8 +46,8 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 19
versionCode 35
versionName "0.8.3"
versionCode 36
versionName "0.8.4"
}
compileOptions {