Skip to content

Commit

Permalink
Merge branch 'master' into feature/publish
Browse files Browse the repository at this point in the history
  • Loading branch information
9renpoto committed Jun 9, 2020
2 parents 0a890e0 + 5fbc205 commit 4e86ed1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 113 deletions.
119 changes: 7 additions & 112 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
Expand Up @@ -50,7 +50,7 @@
"@types/socket.io-client": "1.4.33",
"@types/supertest": "2.0.9",
"apollo-server-express": "2.14.1",
"apollo-server-testing": "2.14.1",
"apollo-server-testing": "2.14.2",
"coveralls": "3.1.0",
"dotenv": "8.2.0",
"graphql": "14.6.0",
Expand Down

0 comments on commit 4e86ed1

Please sign in to comment.