Daniel Gultsch 1a376cacac Merge pull request #1076 from rk4an/patch-1 ... Update french translation		2015-04-01 20:30:00 +02:00
..
java/eu/siacs/conversations	properly set chat states when receiving otr status messages	2015-03-21 16:43:03 +01:00
res	Merge pull request #1076 from rk4an/patch-1	2015-04-01 20:30:00 +02:00
AndroidManifest.xml	Remove title_activity_conversations and use app_name instead	2015-01-30 17:02:53 +01:00