diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2017-07-05 16:25:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-05 16:25:38 +0200 |
| commit | 062a58f848c80b3a5f499d407396998ba253202c (patch) | |
| tree | 29af51e332bb8d103a786d2f85dcf31f25516ebf /web/src/js/ducks/index.js | |
| parent | 55a20b819e1220024a66bd11275a5c3511f7d295 (diff) | |
| parent | 37fea267c1d171fb661736b96db62943e7b49791 (diff) | |
| download | mitmproxy-062a58f848c80b3a5f499d407396998ba253202c.tar.gz mitmproxy-062a58f848c80b3a5f499d407396998ba253202c.tar.bz2 mitmproxy-062a58f848c80b3a5f499d407396998ba253202c.zip | |
Merge pull request #2423 from MatthewShao/mitmweb-options
[web] [WIP] Mitmweb options editor content
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 0f2426ec..be2f2885 100644 --- a/web/src/js/ducks/index.js +++ b/web/src/js/ducks/index.js @@ -4,6 +4,7 @@ import flows from "./flows" import settings from "./settings" import ui from "./ui/index" import connection from "./connection" +import options from './options' export default combineReducers({ eventLog, @@ -11,4 +12,5 @@ export default combineReducers({ settings, connection, ui, + options, }) |