Merge remote-tracking branch 'origin/master' into websocket

Conflicts:
	mitmproxy/web/static/app.js
	web/src/js/components/ProxyApp.jsx

1 files changed, 2 insertions, 7 deletions

diff --git a/web/src/js/components/Header.jsx b/web/src/js/components/Header.jsx
index 93ca5154..ab25eb41 100644
--- a/web/src/js/components/Header.jsx
+++ b/web/src/js/components/Header.jsx
@@ -12,10 +12,6 @@ import {setActiveMenu} from '../ducks/ui.js'
 class Header extends Component {
     static entries = [MainMenu, ViewMenu, OptionMenu]
 
-    static propTypes = {
-        settings: PropTypes.object.isRequired,
-    }
-
     handleClick(active, e) {
         e.preventDefault()
         this.props.setActiveMenu(active.title)
@@ -24,7 +20,7 @@ class Header extends Component {
     }
 
     render() {
-        const { settings, updateLocation, query, selectedFlow, activeMenu} = this.props
+        const { updateLocation, query, selectedFlow, activeMenu} = this.props
 
         let entries = [...Header.entries]
         if(selectedFlow)
@@ -47,10 +43,9 @@ class Header extends Component {
                 </nav>
                 <div className="menu">
                     <Active
-                        settings={settings}
                         updateLocation={updateLocation}
                         query={query}
-                        />
+                    />
                 </div>
             </header>
         )