Michael Telatynski bec1d718e0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets ... Conflicts: src/components/views/elements/AppTile.js src/utils/WidgetUtils.ts		2020-10-19 20:50:16 +01:00
..
structures	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets	2020-10-19 20:50:16 +01:00
views	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets	2020-10-19 20:50:16 +01:00
_common.scss	…
_components.scss	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets	2020-10-19 20:50:16 +01:00
_font-sizes.scss	…
_font-weights.scss	…
rethemendex.sh	…