element-web/src/settings
Michael Telatynski 1b25ab930e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
 Conflicts:
	src/components/views/dialogs/AddExistingToSpaceDialog.tsx
2021-07-05 13:06:22 +01:00
..
controllers Auto-fix lint errors 2021-06-29 13:11:58 +01:00
handlers Tweak behaviour of setting restricted join rule 2021-07-02 15:18:27 +01:00
watchers Auto-fix lint errors 2021-06-29 13:11:58 +01:00
Layout.ts Added LayoutPropType 2021-02-05 08:16:06 +01:00
SettingLevel.ts Move SettingLevel to its own file 2020-07-28 11:37:59 -06:00
Settings.tsx Merge remote-tracking branch 'upstream/develop' into reorganize-preferences 2021-07-01 18:53:53 +02:00
SettingsStore.ts Iterate PR 2021-06-17 16:22:40 +01:00
UIFeature.ts Add a UI Feature flag for room history settings 2020-10-28 09:00:36 -06:00
WatchManager.ts Fix watching settings 2021-06-05 01:16:52 -04:00