diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-03-03 19:42:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-03 19:42:25 +0100 |
| commit | d252c5b2320859c58900b68a7f5ac82199aa1e83 (patch) | |
| tree | bee56152ced9b7485267debb8d50fca952d9c447 /devtools/client/netmonitor/reducers/index.js | |
| parent | c3039dadd95f5487e84311a9719604fa901aacd7 (diff) | |
| parent | 8114b67b64e17482e46c2eaa77dd6a6156130dba (diff) | |
| download | UXP-d252c5b2320859c58900b68a7f5ac82199aa1e83.tar UXP-d252c5b2320859c58900b68a7f5ac82199aa1e83.tar.gz UXP-d252c5b2320859c58900b68a7f5ac82199aa1e83.tar.lz UXP-d252c5b2320859c58900b68a7f5ac82199aa1e83.tar.xz UXP-d252c5b2320859c58900b68a7f5ac82199aa1e83.zip | |
Merge pull request #36 from janekptacijarabaci/devtools_import-from-moebius_2
Port across devtools enhancements - 2
Diffstat (limited to 'devtools/client/netmonitor/reducers/index.js')
| -rw-r--r-- | devtools/client/netmonitor/reducers/index.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/devtools/client/netmonitor/reducers/index.js b/devtools/client/netmonitor/reducers/index.js index f36b1d91f..f003c7805 100644 --- a/devtools/client/netmonitor/reducers/index.js +++ b/devtools/client/netmonitor/reducers/index.js @@ -6,10 +6,12 @@ const { combineReducers } = require("devtools/client/shared/vendor/redux"); const filters = require("./filters"); const requests = require("./requests"); +const timingMarkers = require("./timing-markers"); const ui = require("./ui"); module.exports = combineReducers({ filters, requests, + timingMarkers, ui, }); |