Daniel Gultsch e6d336c293 Merge branch 'development' of github.com:siacs/Conversations into development		2015-05-10 11:45:01 +02:00
..
java/eu/siacs/conversations	Merge branch 'development' of github.com:siacs/Conversations into development	2015-05-10 11:45:01 +02:00
res	changed conversation red to material red	2015-05-10 03:14:13 +02:00
AndroidManifest.xml	allow sharing multiple images at once. fixes #1090	2015-04-11 14:53:10 +02:00