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

..

_AppearanceUserSettingsTab.scss

$primary-fg-color -> $primary-content

2021-08-12 17:18:18 +02:00

_GeneralUserSettingsTab.scss

Spread out the general user settings sections like the other tabs

2020-09-21 18:37:08 -06:00

_HelpUserSettingsTab.scss

Avoid access token overflow

2021-08-15 14:40:31 +02:00

_LabsUserSettingsTab.scss

Show Spaces beta card in Labs & My Communities view

2021-04-27 16:29:42 +01:00

_MjolnirUserSettingsTab.scss

Appease the other linter

2019-10-31 16:30:51 -06:00

_NotificationUserSettingsTab.scss

Auto-fix stylelint issues

2019-07-10 16:56:40 +01:00

_PreferencesUserSettingsTab.scss

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

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

_SecurityUserSettingsTab.scss

Fix sizing of the security warning icon

2020-06-02 21:54:38 +01:00

_VoiceUserSettingsTab.scss

Make mixin for fields in settings that need to be the same width

2019-08-13 12:53:14 +01:00