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	Conform to new react and typescript eslint rules	2021-07-19 22:43:11 +01:00
autocomplete	…
components	Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile	2021-07-20 13:15:04 +02:00
editor	Fix tests	2021-07-15 10:59:52 +01:00
end-to-end-tests	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686	2021-07-15 10:04:48 +01:00
i18n	…
i18n-test	…
img	…
notifications	…
stores	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686	2021-07-19 16:47:31 +01:00
utils	…
.eslintrc.js	…
CallHandler-test.ts	…
DecryptionFailureTracker-test.js	…
KeyBindingsManager-test.ts	…
ScalarAuthClient-test.js	…
Terms-test.js	…
UserActivity-test.js	…
createRoom-test.js	Conform to new react and typescript eslint rules	2021-07-19 22:43:11 +01:00
setupTests.js	…
skinned-sdk.js	…
test-utils.js	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686	2021-07-19 16:47:31 +01:00