Skip to content

Commit

Permalink
Merge branch 'master' into greenkeeper/webpack-4.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisguttandin committed Feb 25, 2018
2 parents fa8673d + fb6a44b commit 5ed48ea
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -41,7 +41,7 @@
"mocha": "^5.0.1",
"rollup": "^0.56.2",
"rollup-plugin-babel": "^3.0.3",
"sinon": "^4.4.1",
"sinon": "^4.4.2",
"sinon-chai": "^2.14.0",
"ts-loader": "^3.5.0",
"tsconfig-holy-grail": "^4.0.0",
Expand Down

0 comments on commit 5ed48ea

Please sign in to comment.