Weblate 79f125cccd Merge branch 'origin/develop' into Weblate.		2021-04-29 13:38:14 +00:00
..
assets	Update forbidden_terms.txt	2021-04-08 18:26:55 +01:00
java/im/vector/app	Cleanup	2021-04-29 11:10:41 +02:00
res	Merge branch 'origin/develop' into Weblate.	2021-04-29 13:38:14 +00:00
AndroidManifest.xml	Merge pull request #2840 from vector-im/feature/bca/spaces_sdk	2021-04-29 10:18:31 +02:00