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

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

Browse source 
 Conflicts:
	src/components/views/rooms/RoomList.js
This commit is contained in:
Michael Telatynski 2020-01-16 00:31:43 +00:00
commit e6ab18c9ba
466 changed files with 4509 additions and 4321 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/structures/SearchBox.js
View file

@ -24,7 +24,7 @@ import { throttle } from 'lodash';
import AccessibleButton from '../../components/views/elements/AccessibleButton';
import classNames from 'classnames';
module.exports = createReactClass({
export default createReactClass({
displayName: 'SearchBox',
propTypes: {