Daniel Gultsch b3f50d1ad0 Merge branch 'master' of https://github.com/gjedeer/Conversations into gjedeer-master		2016-05-28 16:07:25 +02:00
..
java/eu/siacs/conversations	Merge branch 'master' of https://github.com/gjedeer/Conversations into gjedeer-master	2016-05-28 16:07:25 +02:00
res	pulled translations from transifex	2016-05-27 20:07:39 +02:00
AndroidManifest.xml	expert setting to manually change presence	2016-04-22 21:25:06 +02:00