Benoit Marty 3e212655eb Merge pull request #5117 from vector-im/feature/adm/use-case-store-crash ... Handling use case screen in sanity tests		2022-02-03 00:53:20 +01:00
..
assets	Add licence mention as per https://github.com/maplibre/maplibre-gl-native/blob/master/LICENSE.md	2022-01-25 17:51:17 +01:00
java/im/vector/app	Merge pull request #5117 from vector-im/feature/adm/use-case-store-crash	2022-02-03 00:53:20 +01:00
res	Merge pull request #5131 from vector-im/feature/nfe/spaces_promo_removal	2022-02-03 00:44:07 +01:00
AndroidManifest.xml	Merge branch 'develop' into feature/aris/threads	2022-01-27 17:11:26 +02:00