nikrozman/element-web
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider

Browse Source
This commit is contained in:
Jorik Schellekens
2020-05-20 13:46:17 +01:00
parent 55e72dd5bf b96c1ada8a
commit 6d9d4ee547
473 changed files with 5407 additions and 1434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/settings/SettingsStore.js
View File

@@ -24,7 +24,7 @@ import RoomSettingsHandler from "./handlers/RoomSettingsHandler";
import ConfigSettingsHandler from "./handlers/ConfigSettingsHandler";
import {_t} from '../languageHandler';
import SdkConfig from "../SdkConfig";
import dis from '../dispatcher';
import dis from '../dispatcher/dispatcher';
import {SETTINGS} from "./Settings";
import LocalEchoWrapper from "./handlers/LocalEchoWrapper";
import {WatchManager} from "./WatchManager";