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

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

1 files changed, 4 insertions, 2 deletions

diff --git a/web/src/js/components/common/Button.jsx b/web/src/js/components/common/Button.jsx
index cc2fe9dd..574288df 100644
--- a/web/src/js/components/common/Button.jsx
+++ b/web/src/js/components/common/Button.jsx
@@ -5,9 +5,11 @@ Button.propTypes = {
     text: PropTypes.string.isRequired
 }
 
-export default function Button({ onClick, text, icon }) {
+export default function Button({ onClick, text, icon, disabled }) {
     return (
-        <div className={"btn btn-default"} onClick={onClick}>
+        <div className={"btn btn-default"}
+             onClick={onClick}
+             disabled={disabled}>
             <i className={"fa fa-fw " + icon}/>
             &nbsp;
             {text}