Merge remote-tracking branch 'upstream/develop' into fix/irc-layout-mxid/17648

This commit is contained in:
Šimon Brandner 2021-06-19 17:24:30 +02:00
commit c0f34c9a01
No known key found for this signature in database
GPG key ID: 9760693FDD98A790
90 changed files with 1569 additions and 991 deletions

View file

@ -17,10 +17,10 @@
import React from 'react';
import Flair from '../elements/Flair.js';
import FlairStore from '../../../stores/FlairStore';
import {getUserNameColorClass} from '../../../utils/FormattingUtils';
import { getUserNameColorClass } from '../../../utils/FormattingUtils';
import MatrixClientContext from "../../../contexts/MatrixClientContext";
import {replaceableComponent} from "../../../utils/replaceableComponent";
import MatrixEvent from "matrix-js-sdk/src/models/event";
import { replaceableComponent } from "../../../utils/replaceableComponent";
import { MatrixEvent } from "matrix-js-sdk/src/models/event";
interface IProps {
mxEvent: MatrixEvent;