Skip to content

Commit

Permalink
Merge branch 'master' into snyk-upgrade-52c303a4b0d9e758dc0bdca4b26e1dbe
Browse files Browse the repository at this point in the history
  • Loading branch information
Zodiase committed May 11, 2020
2 parents ca8b9fe + 18c83fe commit cbe9b26
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 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 @@ -11,7 +11,7 @@
},
"dependencies": {
"@babel/runtime": "^7.8.7",
"grommet": "^2.11.1",
"grommet": "^2.11.2",
"meteor-node-stubs": "^1.0.0",
"react": "^16.13.1",
"react-dom": "^16.13.1",
Expand Down

0 comments on commit cbe9b26

Please sign in to comment.