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
_AvatarSetting.scss
_CrossSigningPanel.scss
_DevicesPanel.scss
_E2eAdvancedPanel.scss
_EmailAddresses.scss
_IntegrationManager.scss
_Notifications.scss
_PhoneNumbers.scss
_ProfileSettings.scss
_SecureBackupPanel.scss
_SetIdServer.scss
_SetIntegrationManager.scss
_SpellCheckLanguages.scss
_UpdateCheckButton.scss