matrix-react-sdk

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

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15181
Conflicts:
src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
src/i18n/strings/en_EN.json
src/settings/Settings.ts
src/settings/UIFeature.ts