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-05-17 19:33:55 +02:00
parent 736e09fbb5 ae6c99012e
commit c07d3deea3
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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="13" android:versionCode="14"
android:versionName="0.2.2" > android:versionName="0.2.3" >
<uses-sdk <uses-sdk
android:minSdkVersion="14" android:minSdkVersion="14"

3
CHANGELOG.md
View File

@ -1,5 +1,8 @@
###Changelog ###Changelog
####Version 0.2.3
* regression fix with receiving encrypted images
####Version 0.2.2 ####Version 0.2.2
* Ability to take photos directly * Ability to take photos directly
* Improved openPGP offline handling * Improved openPGP offline handling