Michael Telatynski f412fb44a7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 ... Conflicts: src/SlashCommands.tsx src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx src/createRoom.ts		2021-07-09 08:13:39 +01:00
..
accessibility	Auto-fix lint errors	2021-06-29 13:11:58 +01:00
autocomplete	Auto-fix lint errors	2021-06-29 13:11:58 +01:00
components	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into revert-6135-t3chguy/fix/17494	2021-07-08 13:29:10 +01:00
editor	Auto-fix lint errors	2021-06-29 13:11:58 +01:00
end-to-end-tests	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686	2021-07-09 08:13:39 +01:00
i18n	…
i18n-test	…
img	…
notifications	Auto-fix lint errors	2021-06-29 13:11:58 +01:00
stores	fix tests by including client field on the Room stub and stubbing getJoinedMemberCount	2021-07-06 11:35:56 +01:00
utils	Auto-fix lint errors	2021-06-29 13:11:58 +01:00
.eslintrc.js	…
CallHandler-test.ts	…
DecryptionFailureTracker-test.js	…
KeyBindingsManager-test.ts	Comply with new member-delimiter-style rule	2021-07-01 23:23:03 +01:00
ScalarAuthClient-test.js	Auto-fix lint errors	2021-06-29 13:11:58 +01:00
Terms-test.js	Auto-fix lint errors	2021-06-29 13:11:58 +01:00
UserActivity-test.js	…
createRoom-test.js	Auto-fix lint errors	2021-06-29 13:11:58 +01:00
setupTests.js	…
skinned-sdk.js	Auto-fix lint errors	2021-06-29 13:11:58 +01:00
test-utils.js	fix tests by including client field on the Room stub and stubbing getJoinedMemberCount	2021-07-06 11:35:56 +01:00