Daniel Gultsch 6f21dc84d5 Merge pull request #714 from betheg/muc_bookmark_cd ... MUC: option to set/delete bookmark in conference details.		2014-11-24 09:31:29 +01:00
..
java/eu/siacs/conversations	MUC: option to set/delete bookmark in conference details.	2014-11-23 21:37:45 +01:00
res	Merge pull request #714 from betheg/muc_bookmark_cd	2014-11-24 09:31:29 +01:00
AndroidManifest.xml	initial smp support	2014-11-11 17:40:51 +01:00