Benoit Marty f54246f718 Update bg color on room list		2021-06-14 12:45:44 +02:00
..
assets	Update forbidden_terms.txt	2021-04-08 18:26:55 +01:00
java/im/vector/app	Merge pull request #3456 from vector-im/feature/fga/dial_pad_tab	2021-06-11 12:23:19 +02:00
res	Update bg color on room list	2021-06-14 12:45:44 +02:00
AndroidManifest.xml	Merge branch 'develop' into feature/bma/login_v2	2021-05-20 15:18:18 +02:00