6 commits

Author	SHA1	Message	Date
Aaron Raimist	7b94e13a84	Merge branch 'develop' into sort-imports ... Signed-off-by: Aaron Raimist <aaron@raim.ist>	2021-12-09 08:34:20 +00:00
Michael Telatynski	27c3153947	Unified room context menus (#7072)	2021-11-15 11:39:25 +00:00
Aaron Raimist	027b3660bb	Manual fixes ... Signed-off-by: Aaron Raimist <aaron@raim.ist>	2021-10-22 17:49:12 -05:00
Aaron Raimist	bdc56be863	Auto fix ... Signed-off-by: Aaron Raimist <aaron@raim.ist>	2021-10-22 17:23:37 -05:00
Andy Balaam	e8dba59b42	Fix review comments from Šimon Brandner. ... Rename test->it; Rename users->userIds; Un-break a line. Signed-off-by: Andy Balaam <andyb@element.io>	2021-10-04 11:41:09 +01:00
Andy Balaam	226131409f	Unit tests for room avatars in DM and non-DM rooms ... Signed-off-by: Andy Balaam <andyb@element.io>	2021-10-01 15:08:19 +01:00