ganfra 4d2fb303d2 Merge branch 'develop' into feature/fga/timeline_virtual_room		2021-06-10 16:59:04 +02:00
..
assets	Update forbidden_terms.txt	2021-04-08 18:26:55 +01:00
java/im/vector/app	Merge branch 'develop' into feature/fga/timeline_virtual_room	2021-06-10 16:59:04 +02:00
res	Merge branch 'origin/develop' into Weblate.	2021-06-10 10:18:38 +00:00
AndroidManifest.xml	Merge branch 'develop' into feature/bma/login_v2	2021-05-20 15:18:18 +02:00