mirror of
				https://github.com/vector-im/element-web.git
				synced 2025-11-04 02:02:14 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
		
						commit
						7e721adf80
					
				@ -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;
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user