imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/irc-ui

Browse source
This commit is contained in:
Jorik Schellekens 2020-05-19 18:03:44 +01:00
commit 323d0762fc
189 changed files with 2091 additions and 976 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";

2
src/settings/controllers/CustomStatusController.js
View file

@ -15,7 +15,7 @@ limitations under the License.
*/
import SettingController from "./SettingController";
import dis from "../../dispatcher";
import dis from "../../dispatcher/dispatcher";
export default class CustomStatusController extends SettingController {
onChange(level, roomId, newValue) {