mirror of
https://github.com/element-hq/element-web.git
synced 2024-12-15 11:41:30 +03:00
687a2e56b2
Conflicts: src/components/views/settings/tabs/user/SecurityUserSettingsTab.js src/settings/Settings.ts src/settings/UIFeature.ts |
||
---|---|---|
.. | ||
controllers | ||
handlers | ||
watchers | ||
SettingLevel.ts | ||
Settings.ts | ||
SettingsStore.ts | ||
UIFeature.ts | ||
WatchManager.ts |