ganfra e356e71431 Merge branch 'develop' into feature/fga/log_tags_voip		2021-07-22 15:32:25 +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/log_tags_voip	2021-07-22 15:32:25 +02:00
res	grammar: Server matching ... -> Servers matching ...	2021-07-22 11:58:32 +01:00
AndroidManifest.xml	Rename themes follow Android conventions	2021-06-16 12:34:14 +02:00