Michael Telatynski 1286be1ffb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244 ... Conflicts: src/components/views/room_settings/AliasSettings.tsx		2021-06-22 22:02:09 +01:00
..
structures	…
views	…
_common.scss	…
_components.scss	…
_font-sizes.scss	…
_font-weights.scss	…
rethemendex.sh	…