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
..
accessibility	…
autocomplete	…
components	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282	2021-06-22 21:15:53 +01:00
editor	…
end-to-end-tests	…
i18n	…
i18n-test	…
img	…
notifications	…
stores	…
utils	…
.eslintrc.js	…
CallHandler-test.ts	…
DecryptionFailureTracker-test.js	…
KeyBindingsManager-test.ts	…
ScalarAuthClient-test.js	…
Terms-test.js	…
UserActivity-test.js	…
createRoom-test.js	…
mock-clock.js	…
setupTests.js	…
skinned-sdk.js	…
test-utils.js	…