Benoit Marty 6d56220d98 Merge branch 'develop' into improvement-957-catchup-indicator-on-invite		2020-04-15 15:00:34 +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 improvement-957-catchup-indicator-on-invite	2020-04-15 15:00:34 +02:00
res	Fix lint issue	2020-04-15 09:50:25 +02:00
AndroidManifest.xml	Initial implementation of multipicker.	2020-03-20 12:12:59 +03:00