1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00

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

This commit is contained in:
Weblate
2018-07-24 15:03:32 +00:00

View File

@@ -26,7 +26,7 @@ export default React.createClass({
onFinished: PropTypes.func.isRequired, onFinished: PropTypes.func.isRequired,
}, },
componentDidMount: function() { componentWillMount: function() {
const config = SdkConfig.get(); const config = SdkConfig.get();
// Dialog shows inverse of m.federate (noFederate) strict false check to skip undefined check (default = true) // Dialog shows inverse of m.federate (noFederate) strict false check to skip undefined check (default = true)
this.defaultNoFederate = config.default_federate === false; this.defaultNoFederate = config.default_federate === false;