Skip to content

Commit

Permalink
Merge branch 'master' into snyk-upgrade-850ece84d87028d22489042c5ae30c9e
Browse files Browse the repository at this point in the history
  • Loading branch information
mtrezza authored Aug 22, 2021
2 parents 83f571d + 65c967a commit 4261b04
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 68 deletions.
87 changes: 20 additions & 67 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 @@ -24,7 +24,7 @@
"@graphql-tools/stitch": "6.2.4",
"@graphql-tools/utils": "6.2.4",
"@parse/fs-files-adapter": "1.2.0",
"@parse/push-adapter": "3.4.0",
"@parse/push-adapter": "3.4.1",
"apollo-server-express": "2.25.2",
"bcryptjs": "2.4.3",
"body-parser": "1.19.0",
Expand Down

0 comments on commit 4261b04

Please sign in to comment.