Merge branch 'travis/dispatcher-types' into travis/room-list-2
This commit is contained in:
commit
2b4c19e9ba
140 changed files with 666 additions and 481 deletions
|
@ -27,7 +27,7 @@ import PageTypes from '../../PageTypes';
|
|||
import CallMediaHandler from '../../CallMediaHandler';
|
||||
import { fixupColorFonts } from '../../utils/FontManager';
|
||||
import * as sdk from '../../index';
|
||||
import dis from '../../dispatcher';
|
||||
import dis from '../../dispatcher/dispatcher';
|
||||
import sessionStore from '../../stores/SessionStore';
|
||||
import {MatrixClientPeg, MatrixClientCreds} from '../../MatrixClientPeg';
|
||||
import SettingsStore from "../../settings/SettingsStore";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue