Merge remote-tracking branch 'upstream/develop' into feature/pinned-click

This commit is contained in:
Šimon Brandner 2021-06-24 16:59:18 +02:00
commit 430ae0e79f
No known key found for this signature in database
GPG key ID: 9760693FDD98A790
23 changed files with 587 additions and 397 deletions

View file

@ -15,7 +15,7 @@
*/
import React from 'react';
import Flair from '../elements/Flair.js';
import Flair from '../elements/Flair';
import FlairStore from '../../../stores/FlairStore';
import { getUserNameColorClass } from '../../../utils/FormattingUtils';
import MatrixClientContext from "../../../contexts/MatrixClientContext";