imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into matthew/slate

Browse source
This commit is contained in:
Matthew Hodgson 2018-05-19 12:58:43 +01:00
commit 4972a234c4
15 changed files with 265 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/elements/TagTile.js
View file

@ -21,7 +21,7 @@ import { MatrixClient } from 'matrix-js-sdk';
import sdk from '../../../index';
import dis from '../../../dispatcher';
import { isOnlyCtrlOrCmdIgnoreShiftKeyEvent } from '../../../Keyboard';
import ContextualMenu from '../../structures/ContextualMenu';
import * as ContextualMenu from '../../structures/ContextualMenu';
import FlairStore from '../../../stores/FlairStore';
import GroupStore from '../../../stores/GroupStore';