Skip to content

Commit

Permalink
Merge branch 'master' into security/deprecate-disabling-plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
legrego authored Dec 9, 2020
2 parents 043ea40 + 2355dde commit 75439cb
Show file tree
Hide file tree
Showing 74 changed files with 1,929 additions and 1,706 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
"**/@types/hapi__hapi": "^18.2.6",
"**/@types/hapi__mimos": "4.1.0",
"**/@types/node": "14.14.7",
"**/chokidar": "^3.4.3",
"**/cross-fetch/node-fetch": "^2.6.1",
"**/deepmerge": "^4.2.2",
"**/fast-deep-equal": "^3.1.1",
Expand Down Expand Up @@ -174,7 +175,7 @@
"chalk": "^4.1.0",
"check-disk-space": "^2.1.0",
"cheerio": "0.22.0",
"chokidar": "^3.4.2",
"chokidar": "^3.4.3",
"chroma-js": "^1.4.1",
"classnames": "2.2.6",
"color": "1.0.3",
Expand Down
Loading

0 comments on commit 75439cb

Please sign in to comment.