Michael Telatynski c74d890774 Merge branches 'develop' and 't3chguy/toasts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3 ...

 Conflicts:

	src/@types/global.d.ts

	src/components/structures/ToastContainer.tsx

2020-05-26 13:38:17 +01:00

..

global.d.ts

Merge branches 'develop' and 't3chguy/toasts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3

2020-05-26 13:38:17 +01:00