Daniel Gultsch a288ad8d6b Merge branch 'master' of github.com:siacs/Conversations		2017-10-01 10:42:24 +02:00
..
java/eu/siacs/conversations	MessageAdapter: trim but don't replace all whitespaces before displaying emoji message	2017-10-01 10:42:01 +02:00
res	Fix typo in error_no_keys_to_trust_server_error	2017-09-30 16:30:12 +02:00
AndroidManifest.xml	Add Android Auto support to notifications	2017-04-14 13:32:01 +02:00