aboutsummaryrefslogtreecommitdiffstats
path: root/web/src/js/ducks/ui/index.js
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2017-07-20 18:01:53 +0200
committerGitHub <noreply@github.com>2017-07-20 18:01:53 +0200
commite1d0bc6de975c377cb42022209ea1b5bce515433 (patch)
tree4f52c967b9312dd0c08e3f88f51b93dd2849dffe /web/src/js/ducks/ui/index.js
parent8526ca9e175af4a903348c39928535ae10f7543d (diff)
parentcb73658dd43e01bdedd84aa31601887b19c106ca (diff)
downloadmitmproxy-e1d0bc6de975c377cb42022209ea1b5bce515433.tar.gz
mitmproxy-e1d0bc6de975c377cb42022209ea1b5bce515433.tar.bz2
mitmproxy-e1d0bc6de975c377cb42022209ea1b5bce515433.zip
Merge pull request #2430 from MatthewShao/mitmweb-options
[web] [WIP] Mitmweb options
Diffstat (limited to 'web/src/js/ducks/ui/index.js')
-rw-r--r--web/src/js/ducks/ui/index.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/web/src/js/ducks/ui/index.js b/web/src/js/ducks/ui/index.js
index 741671b2..f5e6851f 100644
--- a/web/src/js/ducks/ui/index.js
+++ b/web/src/js/ducks/ui/index.js
@@ -2,10 +2,12 @@ import { combineReducers } from 'redux'
import flow from './flow'
import header from './header'
import modal from './modal'
+import optionsEditor from './optionsEditor'
// TODO: Just move ducks/ui/* into ducks/?
export default combineReducers({
flow,
header,
- modal
+ modal,
+ optionsEditor,
})