Benoit Marty 71aac37ec7 Merge pull request #5330 from vector-im/feature/fga/more_realm_fixing ... Feature/fga/more realm fixing		2022-02-28 21:02:10 +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 #5330 from vector-im/feature/fga/more_realm_fixing	2022-02-28 21:02:10 +01:00
res	Merge pull request #5349 from vector-im/feature/mna/5005-save-image	2022-02-28 14:23:17 +01:00
AndroidManifest.xml	Merge branch 'develop' into feature/aris/threads	2022-01-27 17:11:26 +02:00