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

 Conflicts:

	src/stores/SpaceStore.tsx

2021-07-22 12:44:27 +01:00

..

tabs

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

2021-07-22 12:44:27 +01:00

_AvatarSetting.scss

…

_CrossSigningPanel.scss

…

_DevicesPanel.scss

…

_E2eAdvancedPanel.scss

…

_EmailAddresses.scss

…

_IntegrationManager.scss

…

_Notifications.scss

Apply suggestions from code review

2021-07-16 23:50:06 -06:00

_PhoneNumbers.scss

…

_ProfileSettings.scss

Fixed topic field resizing

2020-12-22 09:40:39 +01:00

_SecureBackupPanel.scss

…

_SetIdServer.scss

…

_SetIntegrationManager.scss

…

_SpellCheckLanguages.scss

Fix licenses

2021-02-18 19:40:24 +01:00

_UpdateCheckButton.scss

…