aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-03-15 03:09:00 +0100
committerMaximilian Hils <git@maximilianhils.com>2015-03-15 03:09:00 +0100
commit47091c8db5172b3394b2a8f8d958ba50724f3311 (patch)
tree4e810a60d2d39f887bf07f15af39faa4e60083aa
parent7b58fe51427b4160f4cf200bde9dd43605a0ce58 (diff)
parent7242654d7d2bfb91424a477002d45f8fa8c659dd (diff)
downloadmitmproxy-47091c8db5172b3394b2a8f8d958ba50724f3311.tar.gz
mitmproxy-47091c8db5172b3394b2a8f8d958ba50724f3311.tar.bz2
mitmproxy-47091c8db5172b3394b2a8f8d958ba50724f3311.zip
Merge branch 'master' of github.com:mitmproxy/mitmproxy
-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": ""