Skip to content

Commit

Permalink
Merge branch 'master' into BRANCHNAME
Browse files Browse the repository at this point in the history
  • Loading branch information
jpoon committed Jan 20, 2019
2 parents eb33f7c + 4812493 commit f57e7fa
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
26 changes: 13 additions & 13 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 @@ -714,7 +714,7 @@
"mocha": "5.2.0",
"plugin-error": "1.0.1",
"prettier": "1.15.3",
"sinon": "7.2.2",
"sinon": "7.2.3",
"tslint": "5.12.1",
"typescript": "3.2.4",
"vscode": "1.1.26"
Expand Down

0 comments on commit f57e7fa

Please sign in to comment.