diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-07-19 23:35:42 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-19 23:35:42 +1200 |
| commit | 6000136b01fe16fc2747c739db878b51e0313006 (patch) | |
| tree | ec794b33494e1ffd9b8f1c00d3ca275f8fd411d1 /web/src/js/ducks/index.js | |
| parent | 09fbebf42a88115ac98ad9bc86947fd1b6771a5d (diff) | |
| parent | 18dd84b9081fb5552d5b5b2560405496445e2110 (diff) | |
| download | mitmproxy-6000136b01fe16fc2747c739db878b51e0313006.tar.gz mitmproxy-6000136b01fe16fc2747c739db878b51e0313006.tar.bz2 mitmproxy-6000136b01fe16fc2747c739db878b51e0313006.zip | |
Merge branch 'master' into cleanup
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, |