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

2018-07-24 15:03:32 +00:00 · 2018-07-24 15:03:32 +00:00 · 7e721adf80
commit 7e721adf80
parent 3eb832aa2f fe3850d61f
1 changed files with 1 additions and 1 deletions
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@ -26,7 +26,7 @@ export default React.createClass({
        onFinished: PropTypes.func.isRequired,
    },

-    componentDidMount: function() {
+    componentWillMount: function() {
        const config = SdkConfig.get();
        // Dialog shows inverse of m.federate (noFederate) strict false check to skip undefined check (default = true)
        this.defaultNoFederate = config.default_federate === false;