Benoit Marty 03496c36dc Fix lint issue		2021-05-25 15:29:38 +02:00
..
assets	Update forbidden_terms.txt	2021-04-08 18:26:55 +01:00
java/im/vector/app	Merge pull request #3383 from vector-im/feature/fga/authenticated_jitsi	2021-05-25 10:24:54 +02:00
res	Fix lint issue	2021-05-25 15:29:38 +02:00
AndroidManifest.xml	Merge branch 'develop' into feature/bma/login_v2	2021-05-20 15:18:18 +02:00