Michael Telatynski 880e16aaa2 Merge branches 'develop' and 't3chguy/leaks' of github.com:matrix-org/matrix-react-sdk into t3chguy/leaks ...

 Conflicts:

	src/components/views/avatars/BaseAvatar.js

	test/components/views/messages/TextualBody-test.js

2020-05-23 11:12:58 +01:00

..

accessibility

…

autocomplete

…

components

Merge branches 'develop' and 't3chguy/leaks' of github.com:matrix-org/matrix-react-sdk into t3chguy/leaks

2020-05-23 11:12:58 +01: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

…