iNPUTmice defb127d6e Merge branch 'dont_trust_cas_preference' of https://github.com/BrianBlade/Conversations into BrianBlade-dont_trust_cas_preference ... Conflicts: src/main/res/values-de/strings.xml src/main/res/values/strings.xml		2015-04-14 15:17:06 +02:00
..
java/eu/siacs/conversations	Merge branch 'dont_trust_cas_preference' of https://github.com/BrianBlade/Conversations into BrianBlade-dont_trust_cas_preference	2015-04-14 15:17:06 +02:00
res	Merge branch 'dont_trust_cas_preference' of https://github.com/BrianBlade/Conversations into BrianBlade-dont_trust_cas_preference	2015-04-14 15:17:06 +02:00
AndroidManifest.xml	allow sharing multiple images at once. fixes #1090	2015-04-11 14:53:10 +02:00