Michael Telatynski 80dff8706c Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/13981 ...

 Conflicts:

	src/@types/global.d.ts

	src/stores/RoomViewStore.tsx

2020-08-04 21:33:27 +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 https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/13981

2020-08-04 21:33:27 +01:00

polyfill.ts

Clarify who is meant to use the polyfill

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