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

This commit is contained in:
Weblate 2018-09-06 12:53:50 +00:00
commit e43dfa39bd

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_');
}