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

delint and add copyright

2020-01-06 14:52:08 +00:00

editor

…

end-to-end-tests

Attempt to fix e2e tests

2020-01-06 23:50:42 +00:00

i18n

…

i18n-test

Rip out the remainder of Bluebird

2019-11-18 10:03:05 +00:00

img

…

notifications

…

stores

Rip out the remainder of Bluebird

2019-11-18 10:03:05 +00:00

utils

Add tests

2019-12-05 00:11:10 +00:00

.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

Add TextualBody-test.js

2020-01-06 13:28:29 +00:00

UserActivity-test.js

…