Daniel Gultsch 77caf73103 Merge pull request #1146 from BrianBlade/minor_otr_tweaks ... OTR: Fix onContactStatusChanged & dont archive OTR		2015-04-25 14:09:38 +02:00
..
java/eu/siacs/conversations	Merge pull request #1146 from BrianBlade/minor_otr_tweaks	2015-04-25 14:09:38 +02:00
res	added missing translations from transifex	2015-04-21 10:13:28 +02:00
AndroidManifest.xml	allow sharing multiple images at once. fixes #1090	2015-04-11 14:53:10 +02:00