Daniel Gultsch d4a05b8ef3 Merge branch 'master' of github.com:siacs/Conversations		2018-03-14 08:22:18 +01:00
..
java/eu/siacs/conversations	make camera feature optional	2018-03-14 08:21:49 +01:00
res	migrated conference details to binding	2018-03-13 12:26:26 +01:00
AndroidManifest.xml	Merge branch 'master' of github.com:siacs/Conversations	2018-03-14 08:22:18 +01:00