Daniel Gultsch 1f34fb742c Merge branch 'development'		2015-08-15 14:26:37 +02:00
..
java/eu/siacs/conversations	Merge branch 'development'	2015-08-15 14:26:37 +02:00
res	show HTTP upload availability on Edit account screen	2015-08-14 22:24:05 +02:00
AndroidManifest.xml	renamed multi-end / axolotl to OMEMO	2015-08-08 13:29:21 +02:00