Benoit Marty f74ab2dfd4 Merge branch 'develop' into feature/save_attachement_legacy		2020-07-04 12:16:50 +02:00
..
assets	Uniform emoji representation for all platform	2020-04-10 11:02:33 +02:00
java/im/vector/riotx	Merge branch 'develop' into feature/save_attachement_legacy	2020-07-04 12:16:50 +02:00
res	Merge branch 'develop' into feature/new_home	2020-07-01 20:31:55 +02:00
AndroidManifest.xml	Fix lint false-positive about WorkManger (#1012)	2020-07-02 12:21:23 +02:00