Michael Telatynski a688e5b8b3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 ...

 Conflicts:

	src/components/structures/LoggedInView.tsx

	src/stores/SpaceStore.tsx

2021-09-06 11:41:09 +01:00

..

room

$secondary-fg-color -> $secondary-content

2021-08-12 17:19:26 +02:00

user

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088

2021-09-06 11:41:09 +01:00

_SettingsTab.scss

$secondary-fg-color -> $secondary-content

2021-08-12 17:19:26 +02:00