Merge branch 'master' into 'csstheming'
# Conflicts: # src/App.js
This commit is contained in:
		@@ -40,6 +40,8 @@ class App extends React.Component {
 | 
			
		||||
                        passwordsupport: result.passwordEnabled,
 | 
			
		||||
                        mediacentername: result.mediacenter_name
 | 
			
		||||
                    });
 | 
			
		||||
                    // set tab title to received mediacenter name
 | 
			
		||||
                    document.title = result.mediacenter_name;
 | 
			
		||||
                }));
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user