Benoit Marty 5d69bc934a Merge pull request #3182 from vector-im/feature/ons/message_composer_ui ... Message Composer Design Update		2021-06-09 18:26:55 +02:00
..
assets	Update forbidden_terms.txt	2021-04-08 18:26:55 +01:00
java/im/vector/app	Merge pull request #3182 from vector-im/feature/ons/message_composer_ui	2021-06-09 18:26:55 +02:00
res	Fix a color	2021-06-09 17:52:13 +02:00
AndroidManifest.xml	Merge branch 'develop' into feature/bma/login_v2	2021-05-20 15:18:18 +02:00