Merge branch 'develop' into revert-2149-revert-2145-bwindels/fixllroompermission

This commit is contained in:
Bruno Windels 2018-09-06 15:35:41 +02:00
commit 26df485607

View file

@ -336,7 +336,7 @@ export default class MessageComposerInput extends React.Component {
}
}
componentDidMount() {
componentWillMount() {
this.dispatcherRef = dis.register(this.onAction);
this.historyManager = new ComposerHistoryManager(this.props.room.roomId, 'mx_slate_composer_history_');
}