Daniel Gultsch 8126bc98b4 Merge branch 'master' of https://github.com/invisiblek/Conversations into invisiblek-master		2017-08-31 12:43:34 +02:00
..
eu/siacs/conversations	Merge branch 'master' of https://github.com/invisiblek/Conversations into invisiblek-master	2017-08-31 12:43:34 +02:00