Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Commit

Permalink
Merge branch 'master' into greenkeeper/lolex-2.7.2
Browse files Browse the repository at this point in the history
  • Loading branch information
abhiomkar authored Oct 10, 2018
2 parents e312180 + 28a8cfe commit ca095c9
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 @@ -78,7 +78,7 @@
"eslint-plugin-mocha": "^5.0.0",
"express": "^4.16.3",
"extract-text-webpack-plugin": "^3.0.0",
"fs-extra": "^6.0.1",
"fs-extra": "^7.0.0",
"glob": "^7.1.1",
"google-closure-compiler": "^20180805.0.0",
"handlebars": "^4.0.11",
Expand Down

0 comments on commit ca095c9

Please sign in to comment.