diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-08-17 15:01:31 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-08-17 15:01:31 +0300 |
| commit | 834f1b30d50dc3ad9d0f6ff81cef24dc6ebc375c (patch) | |
| tree | e5f2e714e695d995649942111f29d4e857b33a67 /package.json | |
| parent | 6aeb99c98bee304c5010a1173c47777eff1e04a5 (diff) | |
| parent | fe0ffcc78941bf9de98e3698e743c3cbb9846b6a (diff) | |
Merge branch 'master' into issue-discussions-refactor
# Conflicts:
# package.json
# spec/support/features/reportable_note_shared_examples.rb
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json index 9bc8db66e06..8f37ac21c2e 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "vue-resource": "^1.3.4", "vue-template-compiler": "^2.2.6", "vuex": "^2.3.1", - "webpack": "^3.4.0", + "webpack": "^3.5.4", "webpack-bundle-analyzer": "^2.8.2", "webpack-stats-plugin": "^0.1.5" }, |