imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into t3chguy/rightpanel

Browse source
This commit is contained in:
Travis Ralston 2020-01-16 10:04:18 -07:00
commit cd9fc72fff
471 changed files with 4825 additions and 4356 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/views/right_panel/UserInfo.js
View file

@ -23,7 +23,7 @@ import classNames from 'classnames';
import {Group, RoomMember, User} from 'matrix-js-sdk';
import dis from '../../../dispatcher';
import Modal from '../../../Modal';
import sdk from '../../../index';
import * as sdk from '../../../index';
import { _t } from '../../../languageHandler';
import createRoom from '../../../createRoom';
import DMRoomMap from '../../../utils/DMRoomMap';
@ -35,7 +35,7 @@ import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
import RoomViewStore from "../../../stores/RoomViewStore";
import MultiInviter from "../../../utils/MultiInviter";
import GroupStore from "../../../stores/GroupStore";
import MatrixClientPeg from "../../../MatrixClientPeg";
import {MatrixClientPeg} from "../../../MatrixClientPeg";
import E2EIcon from "../rooms/E2EIcon";
import {useEventEmitter} from "../../../hooks/useEventEmitter";
import {textualPowerLevel} from '../../../Roles';