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
..
2021-06-29 13:11:58 +01:00
2021-07-15 10:59:52 +01:00
2017-06-01 21:10:32 +02:00
2020-09-15 13:19:47 +01:00
2016-10-11 14:20:40 +01:00
2021-06-29 13:11:58 +01:00
2021-06-29 13:11:58 +01:00
2021-06-29 13:11:58 +01:00