sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into development

This commit is contained in:
Daniel Gultsch 2014-07-22 14:48:07 +02:00
parent 66e3ccc2dc 34dafc24af
commit c3ef8e0a5b
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?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="19" android:versionCode="20"
android:versionName="0.4.1" > android:versionName="0.5-beta" >
<uses-sdk <uses-sdk
android:minSdkVersion="14" android:minSdkVersion="14"
@ -107,4 +107,4 @@
</activity> </activity>
</application> </application>
</manifest> </manifest>

5
CHANGELOG.md
View File

@ -1,5 +1,10 @@
###Changelog ###Changelog
####Version 0.5
* UI overhaul
* MUC / Conference bookmarks
* A lot of bug fixes
####Version 0.4 ####Version 0.4
* OTR file encryption * OTR file encryption
* keep OTR messages and files on device until both parties or online at the same time * keep OTR messages and files on device until both parties or online at the same time