Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/snyk-upgrade-06ce69b4be98f456144…
Browse files Browse the repository at this point in the history
…51034b6cf0ca9'

# Conflicts:
#	package-lock.json
  • Loading branch information
gpicron committed Apr 22, 2020
2 parents 3740865 + 668d7e6 commit 474045b
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 46 deletions.
57 changes: 12 additions & 45 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 @@ -72,7 +72,7 @@
"ssb-config": "^3.4.4",
"ssb-db": "^19.4.0",
"ts-node": "^8.6.2",
"typedoc": "^0.16.11",
"typedoc": "^0.17.3",
"typedoc-plugin-markdown": "^2.2.16",
"typescript": "^3.8.2"
},
Expand Down

0 comments on commit 474045b

Please sign in to comment.