Daniel Gultsch ecac1e5943 Merge branch 'development'		2015-08-15 19:12:51 +02:00
..
java/eu/siacs/conversations	Merge branch 'development'	2015-08-15 19:12:51 +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