element-web/src/settings
Michael Telatynski 687a2e56b2 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15179
 Conflicts:
	src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
	src/settings/Settings.ts
	src/settings/UIFeature.ts
2020-09-18 11:29:38 +01:00
..
controllers Merge pull request #5208 from matrix-org/travis/ui-func/base 2020-09-15 08:53:48 -06:00
handlers Implement new config style for features 2020-08-17 13:24:55 -06:00
watchers Replace Riot with Element in docs and comments 2020-08-03 18:33:36 +01:00
SettingLevel.ts Move SettingLevel to its own file 2020-07-28 11:37:59 -06:00
Settings.ts Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15179 2020-09-18 11:29:38 +01:00
SettingsStore.ts Implement force state for features like in the proposal 2020-08-17 13:51:41 -06:00
UIFeature.ts Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15179 2020-09-18 11:29:38 +01:00
WatchManager.ts Make Travis an ounce happier 2020-09-08 15:07:16 +01:00