narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

Merge branch 'master' into development

Browse source 
Conflicts:
	AndroidManifest.xml
This commit is contained in:
iNPUTmice 2014-07-31 10:22:02 +02:00
parent 3d9eb0e8fe 9b34f39cd2
commit e3cec50d1f
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="eu.siacs.conversations" package="eu.siacs.conversations"
android:versionCode="23" android:versionCode="24"
android:versionName="0.6-alpha" > android:versionName="0.6-alpha" >
<uses-sdk <uses-sdk

5
CHANGELOG.md
View file

@ -1,6 +1,9 @@
###Changelog ###Changelog
###Version 0.5.1 ####Version 0.5.2
* minor bug fixes
####Version 0.5.1
* couple of small bug fixes that have been missed in 0.5 * couple of small bug fixes that have been missed in 0.5
* complete translations for Swedish, Dutch, German, Spanish, French, Russian * complete translations for Swedish, Dutch, German, Spanish, French, Russian