Michael Telatynski 764b94c7ae Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/notifications/14880 ... Conflicts: src/@types/global.d.ts		2020-08-05 11:11:14 +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/notifications/14880	2020-08-05 11:11:14 +01:00
polyfill.ts	Clarify who is meant to use the polyfill	2020-07-08 07:51:04 -06:00