Skip to content

Commit

Permalink
Merge branch 'master' into longArn
Browse files Browse the repository at this point in the history
  • Loading branch information
piradeepk authored Jun 28, 2019
2 parents b1403ae + 628ea1b commit 767f8fa
Show file tree
Hide file tree
Showing 50 changed files with 6,698 additions and 1,118 deletions.
46 changes: 27 additions & 19 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 @@ -13,7 +13,7 @@
"@types/nodeunit": "^0.0.30",
"conventional-changelog-cli": "^2.0.21",
"jest": "^24.8.0",
"jsii-diff": "file:vendored_deps/jsii-diff-0.12.x.tgz",
"jsii-diff": "file:vendored_deps/jsii-diff-0.13.x.tgz",
"lerna": "^3.15.0",
"nodeunit": "^0.11.3",
"nyc": "^14.1.1",
Expand Down
Loading

0 comments on commit 767f8fa

Please sign in to comment.