Michael Telatynski 00b1a03a3e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets ... Conflicts: src/@types/global.d.ts src/FromWidgetPostMessageApi.js src/WidgetMessaging.js src/widgets/WidgetApi.ts		2020-10-19 19:46:07 +01:00
..
css	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets	2020-10-19 19:46:07 +01:00
fonts	…
img	…
media	…
themes	Merge pull request #5319 from matrix-org/t3chguy/fix/null-avatar	2020-10-15 17:48:51 +01:00