Skip to content

Commit

Permalink
Merge 8a9a783 into 4d49948
Browse files Browse the repository at this point in the history
  • Loading branch information
devoto13 authored May 17, 2020
2 parents 4d49948 + 8a9a783 commit af4346f
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 39 deletions.
80 changes: 42 additions & 38 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 @@ -403,7 +403,7 @@
"http-proxy": "^1.18.0",
"isbinaryfile": "^4.0.6",
"lodash": "^4.17.15",
"log4js": "^4.0.0",
"log4js": "^6.2.1",
"mime": "^2.4.5",
"minimatch": "^3.0.4",
"qjobs": "^1.2.0",
Expand Down

0 comments on commit af4346f

Please sign in to comment.