Peter Vágner d4be68191c Fix conflicts after rebase ... Signed-off-by: Peter Vágner <pvdeejay@gmail.com>		2019-10-02 20:04:33 +02:00
..
assets	Handle M_CONSENT_NOT_GIVEN error (#64)	2019-09-13 18:21:56 +02:00
java/im/vector/riotx	Add contentDescription for the read receipts	2019-10-02 20:04:33 +02:00
res	Fix conflicts after rebase	2019-10-02 20:04:33 +02:00
AndroidManifest.xml	Auto configure homeserver and identity server URLs of LoginActivity with a magic link	2019-09-16 10:58:51 +02:00