Michael Telatynski 8f4879ea96 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8 ...

 Conflicts:

	src/components/structures/MessagePanel.tsx

	src/components/structures/ScrollPanel.tsx

	src/components/structures/TimelinePanel.tsx

	src/components/views/elements/ErrorBoundary.tsx

	src/components/views/elements/EventListSummary.tsx

	src/components/views/messages/TileErrorBoundary.tsx

2021-06-29 22:14:40 +01:00

..

common.ts

Auto-fix lint errors

2021-06-29 13:11:58 +01:00

diff-dom.ts

Fix edit history modal

2021-06-24 11:16:13 +01:00

global.d.ts

Auto-fix lint errors

2021-06-29 13:11:58 +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