Daniel Gultsch 8742194f4b fixed message merge logic. merge only messages with lower status		2017-04-12 22:24:29 +02:00
..
java/eu/siacs/conversations	fixed message merge logic. merge only messages with lower status	2017-04-12 22:24:29 +02:00
res	pulled translations from transifex	2017-04-06 12:01:17 +02:00
AndroidManifest.xml	allow Conversations to access user trust store	2017-03-05 11:42:29 +01:00