diff options
| author | Jason <jason.daurus@gmail.com> | 2016-06-22 00:49:21 +0800 |
|---|---|---|
| committer | Jason <jason.daurus@gmail.com> | 2016-06-22 00:49:21 +0800 |
| commit | 0cab9ef1fae927f9ef365526262bef32bd1b526b (patch) | |
| tree | e3d64264e0239f21e71b1c2132443001fdadd363 /web/src/js/ducks/ui.js | |
| parent | 9cb5b0af9db83d84af0bdb45d56a9755b400c212 (diff) | |
| parent | 4576dbf8aac8996f7f87320aba3132b657b02278 (diff) | |
| download | mitmproxy-0cab9ef1fae927f9ef365526262bef32bd1b526b.tar.gz mitmproxy-0cab9ef1fae927f9ef365526262bef32bd1b526b.tar.bz2 mitmproxy-0cab9ef1fae927f9ef365526262bef32bd1b526b.zip | |
Merge remote-tracking branch 'origin/master' into websocket
Conflicts:
mitmproxy/web/static/app.js
web/src/js/components/ProxyApp.jsx
Diffstat (limited to 'web/src/js/ducks/ui.js')
| -rw-r--r-- | web/src/js/ducks/ui.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/src/js/ducks/ui.js b/web/src/js/ducks/ui.js index 28a13ea4..c17e042b 100644 --- a/web/src/js/ducks/ui.js +++ b/web/src/js/ducks/ui.js @@ -1,5 +1,5 @@ -import { SELECT_FLOW } from './flows' -const SET_ACTIVE_MENU = 'SET_ACTIVE_MENU' +import {SELECT_FLOW} from "./flows" +export const SET_ACTIVE_MENU = 'SET_ACTIVE_MENU'; const defaultState = { |