Benoit Marty 6e67d4749f Merge pull request #1082 from vector-im/feature/fix_rageshakes ... Fix crashes reported by rageshakes		2020-02-26 16:10:47 +01:00
..
assets	Merge branch 'develop' into feature/attachment_process	2020-02-17 13:48:21 +01:00
java/im/vector/riotx	Merge pull request #1082 from vector-im/feature/fix_rageshakes	2020-02-26 16:10:47 +01:00
res	Merge branch 'develop' into feature/fullscreen_avatar	2020-02-26 16:23:02 +03:00
AndroidManifest.xml	Merge branch 'develop' into feature/fullscreen_avatar	2020-02-26 16:23:02 +03:00