Merge branch 'master' of github.com:mitmproxy/mitmproxy

This commit is contained in:
Maximilian Hils 2015-03-15 03:09:00 +01:00
commit 47091c8db5

View File

@ -17,7 +17,7 @@
"dependencies": { "dependencies": {
"jquery": "", "jquery": "",
"lodash": "", "lodash": "",
"react": "", "react": "0.12.x",
"react-router": "", "react-router": "",
"bootstrap": "", "bootstrap": "",
"flux": "" "flux": ""