diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-06-02 23:45:36 -0700 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-06-02 23:45:36 -0700 |
| commit | e31aa39fc28645fe27646b1e6c6f7e876280ed69 (patch) | |
| tree | 8536a77b278d8182205e8ba757e1e1f00ac67d76 /web/src/js/ducks/index.js | |
| parent | 65fde7f5547f179c80d5858f1ab69583b63fd099 (diff) | |
| parent | 5321f15defcef641bf5b7ba39e5c9057d562c5f8 (diff) | |
| download | mitmproxy-e31aa39fc28645fe27646b1e6c6f7e876280ed69.tar.gz mitmproxy-e31aa39fc28645fe27646b1e6c6f7e876280ed69.tar.bz2 mitmproxy-e31aa39fc28645fe27646b1e6c6f7e876280ed69.zip | |
Merge branch 'redux-ducks'
Diffstat (limited to 'web/src/js/ducks/index.js')
| -rw-r--r-- | web/src/js/ducks/index.js | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/web/src/js/ducks/index.js b/web/src/js/ducks/index.js new file mode 100644 index 00000000..3043344c --- /dev/null +++ b/web/src/js/ducks/index.js @@ -0,0 +1,10 @@ +import {combineReducers} from 'redux' +import eventLog from './eventLog.js' +import websocket from './websocket.js' + +const rootReducer = combineReducers({ + eventLog, + websocket, +}) + +export default rootReducer
\ No newline at end of file |