diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-08-23 11:31:17 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-08-23 11:31:17 +0200 |
| commit | fbe82e4cd9f4cda7264bb78eab9c5c55e6311518 (patch) | |
| tree | de9444c1762fa43c336f595936878677aef8ce43 /package.json | |
| parent | 64820f9a6c17a348dc771a87618140a5c3c8874d (diff) | |
| parent | 101d52b360a6a43f1633c5dd60b78e37bc8c4339 (diff) | |
| download | gitlab-ce-fbe82e4cd9f4cda7264bb78eab9c5c55e6311518.tar.gz | |
Merge branch 'master' into issue-discussions-refactor
# Conflicts:
# package.json
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package.json b/package.json index 8f37ac21c2e..43be99f451b 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "babel-preset-latest": "^6.24.0", "babel-preset-stage-2": "^6.22.0", "bootstrap-sass": "^3.3.6", - "compression-webpack-plugin": "^0.3.2", + "compression-webpack-plugin": "^1.0.0", "copy-webpack-plugin": "^4.0.1", "core-js": "^2.4.1", "cropper": "^2.3.0", @@ -64,7 +64,7 @@ "vue-resource": "^1.3.4", "vue-template-compiler": "^2.2.6", "vuex": "^2.3.1", - "webpack": "^3.5.4", + "webpack": "^3.5.5", "webpack-bundle-analyzer": "^2.8.2", "webpack-stats-plugin": "^0.1.5" }, |