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 | ###Changelog | ||||||
| 
 | 
 | ||||||
|  | ####Version 0.8.4 | ||||||
|  | * bug fixes | ||||||
|  | 
 | ||||||
| ####Version 0.8.3 | ####Version 0.8.3 | ||||||
| * increased UI performance | * increased UI performance | ||||||
| * fixed rotation bugs | * fixed rotation bugs | ||||||
|  | |||||||
| @ -46,8 +46,8 @@ android { | |||||||
| 	defaultConfig { | 	defaultConfig { | ||||||
| 		minSdkVersion 14 | 		minSdkVersion 14 | ||||||
| 		targetSdkVersion 19 | 		targetSdkVersion 19 | ||||||
| 		versionCode 35 | 		versionCode 36 | ||||||
| 		versionName "0.8.3" | 		versionName "0.8.4" | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	compileOptions { | 	compileOptions { | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 iNPUTmice
						iNPUTmice