diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2017-04-30 15:23:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-30 15:23:20 +0200 |
| commit | fccc9bc45ef55e3e7f14ee4a51f376c53b418991 (patch) | |
| tree | a29c33256f8361d5e332ad874afede02e8b0b061 /web/src/js/ducks/index.js | |
| parent | 29ce5a83d2b4cec067731c2f2f77e1cda134c866 (diff) | |
| parent | 97a00728a85a32ca6a8e98a991f6dcf28809e73b (diff) | |
| download | mitmproxy-fccc9bc45ef55e3e7f14ee4a51f376c53b418991.tar.gz mitmproxy-fccc9bc45ef55e3e7f14ee4a51f376c53b418991.tar.bz2 mitmproxy-fccc9bc45ef55e3e7f14ee4a51f376c53b418991.zip | |
Merge pull request #2271 from mhils/mitmweb-connection-indicator
[web] add connection indicator [WIP]
Diffstat (limited to 'web/src/js/ducks/index.js')
| -rw-r--r-- | web/src/js/ducks/index.js | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/web/src/js/ducks/index.js b/web/src/js/ducks/index.js index 753075fa..0f2426ec 100644 --- a/web/src/js/ducks/index.js +++ b/web/src/js/ducks/index.js @@ -1,12 +1,14 @@ -import { combineReducers } from 'redux' -import eventLog from './eventLog' -import flows from './flows' -import settings from './settings' -import ui from './ui/index' +import { combineReducers } from "redux" +import eventLog from "./eventLog" +import flows from "./flows" +import settings from "./settings" +import ui from "./ui/index" +import connection from "./connection" export default combineReducers({ eventLog, flows, settings, + connection, ui, }) |