Daniel Gultsch f579602456 Merge branch 'master' into development		2015-05-25 11:15:14 +02:00
..
java/eu/siacs/conversations	Merge branch 'master' into development	2015-05-25 11:15:14 +02:00
res	pulled translations from transifex	2015-05-20 12:26:38 +02:00
AndroidManifest.xml	allow sharing multiple images at once. fixes #1090	2015-04-11 14:53:10 +02:00