Daniel Gultsch 15c807730e Merge branch 'master' of https://github.com/Mishiranu/Conversations into Mishiranu-master		2016-09-16 11:08:37 +02:00
..
java/eu/siacs/conversations	Merge branch 'master' of https://github.com/Mishiranu/Conversations into Mishiranu-master	2016-09-16 11:08:37 +02:00
res	pulled translations from transifex	2016-09-08 11:19:03 +02:00
AndroidManifest.xml	fixed recreation issues in StartConversationActivity	2016-08-31 17:04:43 +02:00