6 Commits (049040b67d0ac71c679e79b384b97a31db0f62c5)

Author	SHA1	Message	Date
Šimon Brandner	b6ea75b681	Merge remote-tracking branch 'upstream/develop' into task/colors-2 ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-24 08:57:12 +02:00
Michael Telatynski	85b1f166e8	post-merge tidy up	2021-08-12 12:03:14 +01:00
Michael Telatynski	0a209afdc2	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089 ... Conflicts: res/css/structures/_SpaceHierarchy.scss src/components/structures/SpaceHierarchy.tsx src/i18n/strings/en_EN.json	2021-08-12 11:41:03 +01:00
Michael Telatynski	d74e9c4f90	Remove impossible space hierarchy size string	2021-08-11 16:47:14 +01:00
Michael Telatynski	9eb0986353	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089 ... Conflicts: src/i18n/strings/en_EN.json	2021-07-30 11:34:52 +01:00
Michael Telatynski	259627fba2	Clean up SpaceHierarchy	2021-07-30 11:01:49 +01:00