Daniel Gultsch 59ea143147 Merge pull request #1099 from BrianBlade/fix_otr_error_msgs ... Fix OTR-Error messages (#1021)		2015-04-02 11:11:22 +02:00
..
java/eu/siacs/conversations	Merge pull request #1099 from BrianBlade/fix_otr_error_msgs	2015-04-02 11:11:22 +02:00
res	do not overlap account title and switch	2015-04-01 23:45:46 +02:00
AndroidManifest.xml	Remove title_activity_conversations and use app_name instead	2015-01-30 17:02:53 +01:00