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

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import {Store} from 'flux/utils';
import dis from '../dispatcher';
import dis from '../dispatcher/dispatcher';
import DMRoomMap from '../utils/DMRoomMap';
import * as Unread from '../Unread';
import SettingsStore from "../settings/SettingsStore";