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
..
structures	…
views	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets	2020-10-19 19:46:07 +01:00
_common.scss	…
_components.scss	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets	2020-10-19 19:46:07 +01:00
_font-sizes.scss	…
_font-weights.scss	…
rethemendex.sh	…