Daniel Gultsch dafcee6a5b Merge branch 'master' into development		2015-08-19 12:29:23 +02:00
..
java/eu/siacs/conversations	Merge branch 'master' into development	2015-08-19 12:29:23 +02:00
res	Update license string with libraries	2015-08-15 19:07:55 +02:00
AndroidManifest.xml	renamed multi-end / axolotl to OMEMO	2015-08-08 13:29:21 +02:00