diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-06-15 13:40:03 -0700 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-06-15 13:40:03 -0700 |
| commit | c7a891b652f4f85877c4dc8ee04fcd45d9e20a74 (patch) | |
| tree | f80bdafc25555b459bd618ff20273b6b8eddc627 /web/src/js/ducks/index.js | |
| parent | 7de5d7b2984db3c835d3ef2ec3f81ba26a4e458a (diff) | |
| parent | 94e2929b3fd6dc335d1c787167956df18f05494e (diff) | |
| download | mitmproxy-c7a891b652f4f85877c4dc8ee04fcd45d9e20a74.tar.gz mitmproxy-c7a891b652f4f85877c4dc8ee04fcd45d9e20a74.tar.bz2 mitmproxy-c7a891b652f4f85877c4dc8ee04fcd45d9e20a74.zip | |
Merge branch 'add_flow_to_options'
Diffstat (limited to 'web/src/js/ducks/index.js')
| -rw-r--r-- | web/src/js/ducks/index.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/web/src/js/ducks/index.js b/web/src/js/ducks/index.js index 6c521a70..fee4d792 100644 --- a/web/src/js/ducks/index.js +++ b/web/src/js/ducks/index.js @@ -2,11 +2,13 @@ import {combineReducers} from 'redux' import eventLog from './eventLog' import websocket from './websocket' import flows from './flows' +import ui from './ui' const rootReducer = combineReducers({ eventLog, websocket, flows, + ui }) -export default rootReducer
\ No newline at end of file +export default rootReducer |