diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-07-25 17:51:38 -0700 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-07-25 17:51:38 -0700 |
| commit | 817b675c5296d25a1fc41d9c3e68effbcee31100 (patch) | |
| tree | 5940b85167156d5a116046b04ef173591bd0ae6d /web/package.json | |
| parent | ffe6593361670a5963d2e07ed6ac2d5f022a66e7 (diff) | |
| parent | 3ebb58f641612a4c512c045187ffe40879720fa7 (diff) | |
| download | mitmproxy-817b675c5296d25a1fc41d9c3e68effbcee31100.tar.gz mitmproxy-817b675c5296d25a1fc41d9c3e68effbcee31100.tar.bz2 mitmproxy-817b675c5296d25a1fc41d9c3e68effbcee31100.zip | |
Merge branch 'flow_editing_v2'
Diffstat (limited to 'web/package.json')
| -rw-r--r-- | web/package.json | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/web/package.json b/web/package.json index 81b96adc..302803f2 100644 --- a/web/package.json +++ b/web/package.json @@ -11,15 +11,13 @@ "<rootDir>/src/js" ], "unmockedModulePathPatterns": [ - "react", - "jquery" + "react" ] }, "dependencies": { "bootstrap": "^3.3.6", "classnames": "^2.2.5", "flux": "^2.1.1", - "jquery": "^2.2.3", "lodash": "^4.11.2", "react": "^15.1.0", "react-dom": "^15.1.0", @@ -29,7 +27,7 @@ "redux-logger": "^2.6.1", "redux-thunk": "^2.1.0", "shallowequal": "^0.2.2", - "react-codemirror" : "^0.2.6" + "react-codemirror": "^0.2.6" }, "devDependencies": { "babel-core": "^6.7.7", @@ -55,7 +53,9 @@ "gulp-sourcemaps": "^1.6.0", "gulp-util": "^3.0.7", "jest": "^12.1.1", - "react-addons-test-utils": "^15.1.0", + "react": "^15.2.1", + "react-addons-test-utils": "^15.2.1", + "react-dom": "^15.2.1", "uglifyify": "^3.0.1", "vinyl-buffer": "^1.0.0", "vinyl-source-stream": "^1.1.0", |