merge develop

This commit is contained in:
Matthew Hodgson 2015-10-27 23:28:34 +00:00
parent aac00db16b
commit cbaf134625
17 changed files with 30 additions and 54 deletions

View file

@ -20,11 +20,8 @@ var React = require('react');
var sdk = require('matrix-react-sdk')
var MatrixToolbarController = require('matrix-react-sdk/lib/controllers/molecules/MatrixToolbar')
module.exports = React.createClass({
displayName: 'MatrixToolbar',
mixins: [MatrixToolbarController],
hideToolbar: function() {
var Notifier = sdk.getComponent('organisms.Notifier');