Daniel Gultsch d4a05b8ef3 Merge branch 'master' of github.com:siacs/Conversations		2018-03-14 08:22:18 +01:00
..
free/java/eu/siacs/conversations	use emoji compat	2017-09-29 19:44:30 +02:00
main	Merge branch 'master' of github.com:siacs/Conversations	2018-03-14 08:22:18 +01:00
playstore	fix playstore flavor	2018-03-08 16:27:33 +01:00