Michael Telatynski 6e3c647109 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282 ... Conflicts: package.json src/components/views/spaces/SpacePanel.tsx src/i18n/strings/en_EN.json src/stores/SpaceStore.tsx yarn.lock		2021-06-22 21:15:53 +01:00
..
structures	fix tests	2021-06-18 17:56:18 +01:00
views	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282	2021-06-14 21:39:06 +01:00
stub-component.js	fix test stub	2020-08-29 13:02:45 +01:00