Merge branch 'travis/dispatcher-types' into travis/room-list-2

This commit is contained in:
Travis Ralston 2020-05-14 13:40:37 -06:00
commit 2b4c19e9ba
140 changed files with 666 additions and 481 deletions

View file

@ -21,7 +21,7 @@ import PropTypes from 'prop-types';
import classNames from 'classnames';
import { Key } from '../../Keyboard';
import * as sdk from '../../index';
import dis from '../../dispatcher';
import dis from '../../dispatcher/dispatcher';
import * as VectorConferenceHandler from '../../VectorConferenceHandler';
import SettingsStore from '../../settings/SettingsStore';
import {_t} from "../../languageHandler";