Skip to content

Commit

Permalink
Merge branch 'upstream/alpha' into moumouls/update-graphql
Browse files Browse the repository at this point in the history
# Conflicts:
#	package-lock.json
#	package.json
  • Loading branch information
Moumouls committed May 4, 2022
2 parents 934a7ea + b84acd5 commit 59afa27
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 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 @@ -30,7 +30,7 @@
"cors": "2.8.5",
"deepcopy": "2.1.0",
"express": "4.17.2",
"follow-redirects": "1.14.8",
"follow-redirects": "1.14.9",
"graphql": "15.8.0",
"graphql-list-fields": "2.0.2",
"graphql-relay": "0.7.0",
Expand Down

0 comments on commit 59afa27

Please sign in to comment.