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

Merge branches 'develop' and 't3chguy/tags_changes' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/tags_changes

Browse source 
 Conflicts:
	src/components/views/elements/TagTile.js
This commit is contained in:
Michael Telatynski 2019-12-23 11:00:42 +00:00
commit 661701f7ca
71 changed files with 888 additions and 921 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/components/structures/LeftPanel.js
View file

@ -19,7 +19,6 @@ import React from 'react';
import createReactClass from 'create-react-class';
import PropTypes from 'prop-types';
import classNames from 'classnames';
import { MatrixClient } from 'matrix-js-sdk';
import { Key } from '../../Keyboard';
import sdk from '../../index';
import dis from '../../dispatcher';
@ -38,10 +37,6 @@ const LeftPanel = createReactClass({
collapsed: PropTypes.bool.isRequired,
},
contextTypes: {
matrixClient: PropTypes.instanceOf(MatrixClient),
},
getInitialState: function() {
return {
searchFilter: '',