Michael Telatynski eb25c39318 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials ...

 Conflicts:

	src/i18n/strings/en_EN.json

2020-12-01 16:33:29 +00:00

..

accessibility

…

autocomplete

…

components

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials

2020-12-01 16:33:29 +00:00

editor

…

end-to-end-tests

…

i18n

…

i18n-test

…

img

…

notifications

…

stores

…

utils

…

.eslintrc.js

…

createRoom-test.js

…

DecryptionFailureTracker-test.js

…

mock-clock.js

…

PhasedRollOut-test.js

…

ScalarAuthClient-test.js

…

setupTests.js

…

skinned-sdk.js

…

Terms-test.js

…

test-utils.js

…

UserActivity-test.js

…