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

12 KiB

Raw Blame History

View Raw