Daniel Gultsch 5501502e89 Merge branch 'depend_on_sm' into development		2015-08-15 19:18:38 +02:00
..
java/eu/siacs/conversations	Merge branch 'depend_on_sm' into development	2015-08-15 19:18:38 +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