diff options
| author | Clemens <cle1000.cb@gmail.com> | 2016-07-19 12:32:36 +0200 |
|---|---|---|
| committer | Clemens <cle1000.cb@gmail.com> | 2016-07-19 12:32:36 +0200 |
| commit | 698fb11132598a38851383f805dde5ca4d2a046d (patch) | |
| tree | 95fc0184735722ccd6e4697f884496d6852e13f6 /web/src/js/ducks/index.js | |
| parent | 48728af43ad746d70ef3e251dc28b75028dea1e6 (diff) | |
| parent | 18dd84b9081fb5552d5b5b2560405496445e2110 (diff) | |
| download | mitmproxy-698fb11132598a38851383f805dde5ca4d2a046d.tar.gz mitmproxy-698fb11132598a38851383f805dde5ca4d2a046d.tar.bz2 mitmproxy-698fb11132598a38851383f805dde5ca4d2a046d.zip | |
Merge remote-tracking branch 'origin/master' into flow_editing
Diffstat (limited to 'web/src/js/ducks/index.js')
| -rw-r--r-- | web/src/js/ducks/index.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/web/src/js/ducks/index.js b/web/src/js/ducks/index.js index c2488d70..16193530 100644 --- a/web/src/js/ducks/index.js +++ b/web/src/js/ducks/index.js @@ -2,6 +2,7 @@ import { combineReducers } from 'redux' import eventLog from './eventLog' import websocket from './websocket' import flows from './flows' +import flowView from './flowView' import settings from './settings' import ui from './ui' import msgQueue from './msgQueue' @@ -10,6 +11,7 @@ export default combineReducers({ eventLog, websocket, flows, + flowView, settings, ui, msgQueue, |