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

@ -9,7 +9,7 @@ import {MatrixClientPeg} from '../../../../src/MatrixClientPeg';
import sdk from '../../../skinned-sdk';
import { DragDropContext } from 'react-beautiful-dnd';
import dis from '../../../../src/dispatcher';
import dis from '../../../../src/dispatcher/dispatcher';
import DMRoomMap from '../../../../src/utils/DMRoomMap.js';
import GroupStore from '../../../../src/stores/GroupStore.js';