Michael Telatynski 290ef5e652 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets ...

 Conflicts:

	src/@types/global.d.ts

2020-09-28 12:47:47 +01:00

..

common.ts

Introduce a concept of "non-urgent" toasts

2020-07-29 12:43:35 -06:00

global.d.ts

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

2020-09-28 12:47:47 +01:00

polyfill.ts

Clarify who is meant to use the polyfill

2020-07-08 07:51:04 -06:00

sanitize-html.ts

Fix copyright header

2020-09-23 10:06:25 +01:00