Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into dependencies.io-upd…
Browse files Browse the repository at this point in the history
…ate-build-325.1.0
  • Loading branch information
Leonya committed Aug 6, 2018
2 parents 720ab46 + ad50044 commit 0860069
Show file tree
Hide file tree
Showing 8 changed files with 3,119 additions and 784 deletions.
1,155 changes: 928 additions & 227 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -150,7 +150,7 @@
"stylelint": "9.4.0",
"wallaby-webpack": "3.9.10",
"webpack": "2.7.0",
"webpack-dev-server": "2.9.7",
"webpack-dev-server": "2.11.2",
"webpack-dll-bundles-plugin": "1.0.0-beta.5",
"webpack-toolkit": "1.0.0",
"xmlappend": "1.0.4",
Expand Down

0 comments on commit 0860069

Please sign in to comment.