Daniel Gultsch 5a6527bf4c pulled translations from transifex		2018-03-29 12:02:04 +02:00
..
java/eu/siacs/conversations	introduced tri state omemo setting (off by default, on by default, always)	2018-03-27 15:35:53 +02:00
res	pulled translations from transifex	2018-03-29 12:02:04 +02:00
AndroidManifest.xml	Merge branch 'master' of github.com:siacs/Conversations	2018-03-14 08:22:18 +01:00