Daniel Gultsch 8486f47dd9 Merge pull request #1123 from lookshe/development ... Bugfix for issue #1121		2015-04-13 17:57:33 +02:00
..
java/eu/siacs/conversations	Merge pull request #1123 from lookshe/development	2015-04-13 17:57:33 +02:00
res	fixed regression where the selected conversation wasn't highlighted anymore on tabled layout	2015-04-13 15:59:18 +02:00
AndroidManifest.xml	allow sharing multiple images at once. fixes #1090	2015-04-11 14:53:10 +02:00