Michael Telatynski 245a68b3ba Merge branches 'develop' and 't3chguy/clean_up_TextualBody' of github.com:matrix-org/matrix-react-sdk into t3chguy/clean_up_TextualBody ...

 Conflicts:

	yarn.lock

2020-01-09 12:17:21 +00:00

..

autocomplete

…

components

…

editor

…

end-to-end-tests

…

i18n

…

i18n-test

…

img

…

notifications

…

stores

…

utils

…

.eslintrc.js

…

all-tests.js

…

DecryptionFailureTracker-test.js

…

mock-clock.js

…

PhasedRollOut-test.js

…

ScalarAuthClient-test.js

…

skinned-sdk.js

…

Terms-test.js

…

test-utils.js

…

UserActivity-test.js

…