Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/irc-ui
This commit is contained in:
commit
323d0762fc
189 changed files with 2091 additions and 976 deletions
|
@ -19,7 +19,7 @@ import React from 'react';
|
|||
import * as sdk from '../../../index';
|
||||
import {_t} from '../../../languageHandler';
|
||||
import PropTypes from 'prop-types';
|
||||
import dis from '../../../dispatcher';
|
||||
import dis from '../../../dispatcher/dispatcher';
|
||||
import {wantsDateSeparator} from '../../../DateUtils';
|
||||
import {MatrixEvent} from 'matrix-js-sdk';
|
||||
import {makeUserPermalink, RoomPermalinkCreator} from "../../../utils/permalinks/Permalinks";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue