Merge branch 'develop' into travis/ftue/user-lists/5.3-go-button

This commit is contained in:
Travis Ralston 2020-01-16 13:36:59 -07:00
commit 372861c9df
475 changed files with 4911 additions and 4391 deletions

View file

@ -16,12 +16,12 @@ limitations under the License.
*/
import React from 'react';
import MatrixClientPeg from './MatrixClientPeg';
import {MatrixClientPeg} from './MatrixClientPeg';
import MultiInviter from './utils/MultiInviter';
import Modal from './Modal';
import { getAddressType } from './UserAddress';
import createRoom from './createRoom';
import sdk from './';
import * as sdk from './';
import dis from './dispatcher';
import DMRoomMap from './utils/DMRoomMap';
import { _t } from './languageHandler';