Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
stritti committed Oct 4, 2018
2 parents 88b4468 + d7dafac commit d06240d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 15 deletions.
22 changes: 8 additions & 14 deletions log4js/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 log4js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
],
"devDependencies": {
"active-x-obfuscator": "0.0.2",
"chai": "^4.1.2",
"chai": "^4.2.0",
"grunt": "^1.0.3",
"grunt-cli": "^1.3.1",
"grunt-contrib-clean": "^2.0.0",
Expand Down

0 comments on commit d06240d

Please sign in to comment.