Benoit Marty 697b9ff535 Merge branch 'develop' into feature/bca/spaces_quick_fixes		2021-05-21 14:49:12 +02:00
..
assets	Update forbidden_terms.txt	2021-04-08 18:26:55 +01:00
java/im/vector/app	Merge branch 'develop' into feature/bca/spaces_quick_fixes	2021-05-21 14:49:12 +02:00
res	Merge branch 'develop' into feature/bca/spaces_quick_fixes	2021-05-21 14:49:12 +02:00
AndroidManifest.xml	space beta people screen	2021-05-05 17:54:56 +02:00