diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-06-07 12:56:51 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-06-07 12:56:51 +1200 |
| commit | 75ebd638eb6f6ed74f1f191d4f9e30277f4f2d34 (patch) | |
| tree | 9bff77b84d485549f2d9cfad61a4c54b6315088d /web/package.json | |
| parent | e037fe05ff1f0c2893b3f51e06e0261ca4245d63 (diff) | |
| parent | 80292c0ac3c9684ee945546c9b45334178518e4e (diff) | |
| download | mitmproxy-75ebd638eb6f6ed74f1f191d4f9e30277f4f2d34.tar.gz mitmproxy-75ebd638eb6f6ed74f1f191d4f9e30277f4f2d34.tar.bz2 mitmproxy-75ebd638eb6f6ed74f1f191d4f9e30277f4f2d34.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'web/package.json')
| -rw-r--r-- | web/package.json | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/web/package.json b/web/package.json index 3bbed9e8..97a5ad3e 100644 --- a/web/package.json +++ b/web/package.json @@ -21,8 +21,8 @@ "flux": "^2.1.1", "jquery": "^2.2.3", "lodash": "^4.11.2", - "react": "^15.0.2", - "react-dom": "^15.0.2", + "react": "^15.1.0", + "react-dom": "^15.1.0", "react-redux": "^4.4.5", "react-router": "^2.4.0", "redux": "^3.5.2", @@ -53,7 +53,6 @@ "gulp-sourcemaps": "^1.6.0", "gulp-util": "^3.0.7", "jest": "^0.1.40", - "redux-thunk": "^2.1.0", "uglifyify": "^3.0.1", "vinyl-buffer": "^1.0.0", "vinyl-source-stream": "^1.1.0", |