Skip to content

Commit

Permalink
Merge branch 'master' into greenkeeper/eslint-4.13.0
Browse files Browse the repository at this point in the history
  • Loading branch information
axelssonHakan committed Dec 11, 2017
2 parents 3b31418 + db8f8e8 commit f6cae5e
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 8 deletions.
22 changes: 16 additions & 6 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"chai-as-promised": "7.1.1",
"chai-subset": "1.6.0",
"chokidar": "1.7.0",
"chrome-launcher": "0.8.1",
"chrome-launcher": "0.10.0",
"chrome-remote-interface": "0.25.4",
"chrome-unmirror": "0.1.0",
"extend": "3.0.1",
Expand All @@ -45,7 +45,7 @@
"koa-static": "4.0.2",
"mkdirp": "0.5.1",
"mocha": "4.0.1",
"moment": "2.18.1",
"moment": "2.19.4",
"nyc": "11.4.0",
"precinct": "3.8.0",
"sinon": "4.0.1",
Expand Down

0 comments on commit f6cae5e

Please sign in to comment.