matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00
Code Activity

Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/irc-ui

Browse Source
This commit is contained in:
Jorik Schellekens
2020-05-19 18:03:44 +01:00
parent 2e325191bc 465948e402
commit 323d0762fc
189 changed files with 2091 additions and 976 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/elements/ReplyThread.js
View File

@@ -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";