Daniel Gultsch 00b3d5ee35 Merge branch 'master' of github.com:siacs/Conversations		2016-11-08 10:08:58 +01:00
..
java/eu/siacs/conversations	fixed regression of showing delivery failed after receipt	2016-11-07 21:57:08 +01:00
res	Fix typo	2016-11-08 01:46:46 +02:00
AndroidManifest.xml	fixed recreation issues in StartConversationActivity	2016-08-31 17:04:43 +02:00