Benoit Marty df13b32a5c Merge pull request #3373 from vector-im/feature/bma/del_tag ... Implement a workaround to render <del> and <u> in the timeline (#1817)		2021-05-20 15:34:38 +02:00
..
assets	Update forbidden_terms.txt	2021-04-08 18:26:55 +01:00
java/im/vector/app	Merge pull request #3373 from vector-im/feature/bma/del_tag	2021-05-20 15:34:38 +02:00
res	Merge pull request #3348 from vector-im/feature/bca/spaces_fix_invites	2021-05-18 13:56:01 +02:00
AndroidManifest.xml	space beta people screen	2021-05-05 17:54:56 +02:00