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

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

1 files changed, 1 insertions, 22 deletions

diff --git a/web/src/js/actions.js b/web/src/js/actions.js
index 588245ae..bb1d0dd6 100644
--- a/web/src/js/actions.js
+++ b/web/src/js/actions.js
@@ -39,27 +39,6 @@ export var ConnectionActions = {
     }
 };
 
-export var SettingsActions = {
-    update: function (settings) {
-
-        $.ajax({
-            type: "PUT",
-            url: "/settings",
-            contentType: 'application/json',
-            data: JSON.stringify(settings)
-        });
-
-        /*
-        //Facebook Flux: We do an optimistic update on the client already.
-        AppDispatcher.dispatchViewAction({
-            type: ActionTypes.SETTINGS_STORE,
-            cmd: StoreCmds.UPDATE,
-            data: settings
-        });
-        */
-    }
-};
-
 export var FlowActions = {
     accept: function (flow) {
         $.post("/flows/" + flow.id + "/accept");
@@ -119,4 +98,4 @@ export var Query = {
     SEARCH: "s",
     HIGHLIGHT: "h",
     SHOW_EVENTLOG: "e"
-};
\ No newline at end of file
+};