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

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

1 files changed, 3 insertions, 3 deletions

diff --git a/web/src/js/components/ProxyApp.jsx b/web/src/js/components/ProxyApp.jsx
index 89bd95fd..84564c32 100644
--- a/web/src/js/components/ProxyApp.jsx
+++ b/web/src/js/components/ProxyApp.jsx
@@ -120,11 +120,11 @@ class ProxyAppMain extends Component {
     }
 
     render() {
-        const { showEventLog, location, children, settings } = this.props
+        const { showEventLog, location, children } = this.props
         const query = this.getQuery()
         return (
             <div id="container" tabIndex="0" onKeyDown={this.onKeyDown}>
-                <Header ref="header" settings={settings} updateLocation={this.updateLocation} query={query} />
+                <Header ref="header" updateLocation={this.updateLocation} query={query} />
                 {React.cloneElement(
                     children,
                     { ref: 'view', location, query, updateLocation: this.updateLocation }
@@ -132,7 +132,7 @@ class ProxyAppMain extends Component {
                 {showEventLog && (
                     <EventLog key="eventlog"/>
                 )}
-                <Footer settings={settings}/>
+                <Footer />
             </div>
         )
     }