diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-06-17 22:11:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-17 22:11:16 -0700 |
| commit | 23b976a999f41439e83c1010474ec9dc680b8486 (patch) | |
| tree | e6e6d5ac969710292833662d5f1f85e1caed86ab /web/src/js/ducks/index.js | |
| parent | 9c6199db9be34fad18eaedb86463333671ae190a (diff) | |
| parent | f203936fbf51b04f424666f9d2dd63bce8c84404 (diff) | |
| download | mitmproxy-23b976a999f41439e83c1010474ec9dc680b8486.tar.gz mitmproxy-23b976a999f41439e83c1010474ec9dc680b8486.tar.bz2 mitmproxy-23b976a999f41439e83c1010474ec9dc680b8486.zip | |
Merge pull request #1270 from mitmproxy/settings
[web] Settings Ducks 2
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 fee4d792..ffde1a64 100644 --- a/web/src/js/ducks/index.js +++ b/web/src/js/ducks/index.js @@ -2,12 +2,14 @@ import {combineReducers} from 'redux' import eventLog from './eventLog' import websocket from './websocket' import flows from './flows' +import settings from './settings' import ui from './ui' const rootReducer = combineReducers({ eventLog, websocket, flows, + settings, ui }) |