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

Merge branches 'develop' and 't3chguy/roving' of github.com:matrix-org/matrix-react-sdk into t3chguy/roving

Browse source 
 Conflicts:
	src/components/views/rooms/RoomList.js
This commit is contained in:
Michael Telatynski 2020-01-16 00:31:43 +00:00
commit e6ab18c9ba
466 changed files with 4509 additions and 4321 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/views/rooms/RoomTile.js
View file

@ -22,9 +22,9 @@ import PropTypes from 'prop-types';
import createReactClass from 'create-react-class';
import classNames from 'classnames';
import dis from '../../../dispatcher';
import MatrixClientPeg from '../../../MatrixClientPeg';
import {MatrixClientPeg} from '../../../MatrixClientPeg';
import DMRoomMap from '../../../utils/DMRoomMap';
import sdk from '../../../index';
import * as sdk from '../../../index';
import {ContextMenu, ContextMenuButton, toRightOf} from '../../structures/ContextMenu';
import * as RoomNotifs from '../../../RoomNotifs';
import * as FormattingUtils from '../../../utils/FormattingUtils';
@ -34,7 +34,7 @@ import SettingsStore from "../../../settings/SettingsStore";
import {_t} from "../../../languageHandler";
import {RovingTabIndexWrapper} from "../../../contexts/RovingTabIndexContext";
module.exports = createReactClass({
export default createReactClass({
displayName: 'RoomTile',
propTypes: {