Skip to content

Commit

Permalink
Merge branch 'master' into renovate/node-9.x
Browse files Browse the repository at this point in the history
  • Loading branch information
jpoon authored Nov 30, 2018
2 parents aec762a + c48523a commit 63012db
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
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@
"minimist": "1.2.0",
"mocha": "5.2.0",
"plugin-error": "1.0.1",
"prettier": "1.15.2",
"prettier": "1.15.3",
"sinon": "7.1.1",
"tslint": "5.11.0",
"typescript": "3.1.6",
Expand Down

0 comments on commit 63012db

Please sign in to comment.