Merge remote-tracking branch 'upstream/develop' into feature/pinned-click
This commit is contained in:
commit
430ae0e79f
23 changed files with 587 additions and 397 deletions
|
@ -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";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue