aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-03-15 00:03:03 +0100
committerMaximilian Hils <git@maximilianhils.com>2015-03-15 00:03:03 +0100
commit7242654d7d2bfb91424a477002d45f8fa8c659dd (patch)
treeb23a911b2d1cc945957e1849a4fecce50eabf0e6
parent274e6217de0cfc0d22f077f4163ed8794de9bd8b (diff)
parentd7ae3bb638c9e11dc55b7e26da56b103d166270a (diff)
downloadmitmproxy-7242654d7d2bfb91424a477002d45f8fa8c659dd.tar.gz
mitmproxy-7242654d7d2bfb91424a477002d45f8fa8c659dd.tar.bz2
mitmproxy-7242654d7d2bfb91424a477002d45f8fa8c659dd.zip
Merge pull request #519 from legendtang/master
update package.json during transition period, see #518
-rw-r--r--web/package.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/package.json b/web/package.json
index 7dce1993..14a31f48 100644
--- a/web/package.json
+++ b/web/package.json
@@ -17,7 +17,7 @@
"dependencies": {
"jquery": "",
"lodash": "",
- "react": "",
+ "react": "0.12.x",
"react-router": "",
"bootstrap": "",
"flux": ""