Benoit Marty 1ee29555c6 Merge branch 'develop' into feature/ons/static_location		2022-01-25 16:01:16 +01:00
..
assets	Merge branch 'develop' into feature/bma/posthog	2021-12-13 23:18:14 +01:00
java/im/vector/app	Merge branch 'develop' into feature/ons/static_location	2022-01-25 16:01:16 +01:00
res	Cleanup layout	2022-01-25 15:15:47 +01:00
AndroidManifest.xml	Merge branch 'develop' into feature/ons/static_location	2022-01-25 14:29:13 +01:00