Michael Telatynski ae44a6d1fa Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15180 ... Conflicts: src/settings/Settings.ts src/settings/UIFeature.ts		2020-09-17 13:42:27 +01:00
..
structures	…
views	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15180	2020-09-17 13:42:27 +01:00
_common.scss	…
_components.scss	…
_font-sizes.scss	…
_font-weights.scss	…
rethemendex.sh	…