Daniel Gultsch 8126bc98b4 Merge branch 'master' of https://github.com/invisiblek/Conversations into invisiblek-master		2017-08-31 12:43:34 +02:00
..
java/eu/siacs/conversations	Merge branch 'master' of https://github.com/invisiblek/Conversations into invisiblek-master	2017-08-31 12:43:34 +02:00
res	get rid of uneccessary 'own omemo fingerprint' string. fixes #2599	2017-08-28 18:15:39 +02:00
AndroidManifest.xml	Add Android Auto support to notifications	2017-04-14 13:32:01 +02:00