aboutsummaryrefslogtreecommitdiffstats
path: root/web/package.json
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-06-02 23:45:36 -0700
committerMaximilian Hils <git@maximilianhils.com>2016-06-02 23:45:36 -0700
commite31aa39fc28645fe27646b1e6c6f7e876280ed69 (patch)
tree8536a77b278d8182205e8ba757e1e1f00ac67d76 /web/package.json
parent65fde7f5547f179c80d5858f1ab69583b63fd099 (diff)
parent5321f15defcef641bf5b7ba39e5c9057d562c5f8 (diff)
downloadmitmproxy-e31aa39fc28645fe27646b1e6c6f7e876280ed69.tar.gz
mitmproxy-e31aa39fc28645fe27646b1e6c6f7e876280ed69.tar.bz2
mitmproxy-e31aa39fc28645fe27646b1e6c6f7e876280ed69.zip
Merge branch 'redux-ducks'
Diffstat (limited to 'web/package.json')
-rw-r--r--web/package.json4
1 files changed, 4 insertions, 0 deletions
diff --git a/web/package.json b/web/package.json
index 88e976e1..bb32a2dc 100644
--- a/web/package.json
+++ b/web/package.json
@@ -23,11 +23,15 @@
"lodash": "^4.11.2",
"react": "^15.0.2",
"react-dom": "^15.0.2",
+ "react-redux": "^4.4.5",
"react-router": "^2.4.0",
+ "redux": "^3.5.2",
+ "redux-logger": "^2.6.1",
"shallowequal": "^0.2.2"
},
"devDependencies": {
"babel-core": "^6.7.7",
+ "babel-eslint": "^6.0.4",
"babel-jest": "^12.0.2",
"babel-plugin-transform-class-properties": "^6.6.0",
"babel-plugin-transform-object-rest-spread": "^6.8.0",