Benoit Marty b811bf9e7f Fix issue after merge		2020-02-17 23:21:08 +01:00
..
assets	Merge branch 'develop' into feature/attachment_process	2020-02-17 13:48:21 +01:00
java/im/vector/riotx	Fix issue after merge	2020-02-17 23:21:08 +01:00
res	Small iteration on UI	2020-02-17 16:21:10 +01:00
AndroidManifest.xml	Attachment: continue working on preview screen	2020-02-13 19:52:11 +01:00