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
..
accessibility	…
autocomplete	…
components	…
editor	…
end-to-end-tests	…
i18n	…
i18n-test	…
img	…
notifications	…
stores	…
utils	…
.eslintrc.js	…
CallHandler-test.ts	…
DecryptionFailureTracker-test.js	…
KeyBindingsManager-test.ts	…
PosthogAnalytics-test.ts	…
ScalarAuthClient-test.js	…
Terms-test.js	…
UserActivity-test.js	…
createRoom-test.js	…
setupTests.js	…
skinned-sdk.js	…
test-utils.js	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089	2021-08-12 11:41:03 +01:00