Benoit Marty c479073583 Merge pull request #5129 from vector-im/feature/aris/threads_fallback_permalink ... Fix fallback permalink when threads are disabled		2022-02-02 16:06:34 +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 #5129 from vector-im/feature/aris/threads_fallback_permalink	2022-02-02 16:06:34 +01:00
res	Merge pull request #5041 from vector-im/feature/nfe/qr_scanner_fragments_merge	2022-02-02 12:24:28 +01:00
AndroidManifest.xml	Merge branch 'develop' into feature/aris/threads	2022-01-27 17:11:26 +02:00