ganfra 4b6484d317 Merge branch 'develop' into feature/fga/auto_accept_invite		2021-06-18 17:37:24 +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/auto_accept_invite	2021-06-18 17:37:24 +02:00
res	cleaning + rebase	2021-06-18 10:41:24 +02:00
AndroidManifest.xml	Rename themes follow Android conventions	2021-06-16 12:34:14 +02:00