Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2017-12-14 10:36:31 +00:00
commit 527e5be86c
1 changed files with 1 additions and 3 deletions

View File

@ -17,8 +17,6 @@ limitations under the License.
'use strict'; 'use strict';
import React from 'react'; import React from 'react';
import { DragDropContext } from 'react-dnd';
import HTML5Backend from 'react-dnd-html5-backend';
import classNames from 'classnames'; import classNames from 'classnames';
import { KeyCode } from 'matrix-react-sdk/lib/Keyboard'; import { KeyCode } from 'matrix-react-sdk/lib/Keyboard';
import sdk from 'matrix-react-sdk'; import sdk from 'matrix-react-sdk';
@ -199,4 +197,4 @@ var LeftPanel = React.createClass({
} }
}); });
module.exports = DragDropContext(HTML5Backend)(LeftPanel); module.exports = LeftPanel;