Benoit Marty 8a2bafec5f Restore push rule settings - fix issues		2020-02-28 18:35:51 +01:00
..
assets	Merge branch 'develop' into feature/attachment_process	2020-02-17 13:48:21 +01:00
java/im/vector/riotx	Restore push rule settings - fix issues	2020-02-28 18:35:51 +01:00
res	Restore push rule settings - WIP	2020-02-28 16:51:11 +01:00
AndroidManifest.xml	Merge branch 'develop' into feature/fullscreen_avatar	2020-02-26 16:23:02 +03:00