Michael Telatynski 390b05617c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 ... Conflicts: src/components/views/dialogs/CreateRoomDialog.tsx src/components/views/dialogs/RoomUpgradeDialog.tsx src/components/views/dialogs/RoomUpgradeWarningDialog.tsx src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx		2021-07-21 10:46:41 +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	…
ScalarAuthClient-test.js	…
Terms-test.js	…
UserActivity-test.js	…
createRoom-test.js	…
setupTests.js	…
skinned-sdk.js	…
test-utils.js	…