Skip to content

Commit

Permalink
Merge branch 'master' into snyk-upgrade-b5e02a08f91d61a5384d4aee6471f7a4
Browse files Browse the repository at this point in the history
  • Loading branch information
Zodiase committed May 11, 2020
2 parents 1f824ff + b9da26d commit 8d812bc
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
32 changes: 16 additions & 16 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Expand Up @@ -11,10 +11,10 @@
},
"dependencies": {
"@babel/runtime": "^7.9.0",
"grommet": "^2.11.1",
"grommet": "^2.11.2",
"meteor-node-stubs": "^1.0.0",
"react": "^16.13.0",
"react-dom": "^16.13.0",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"styled-components": "^5.0.1"
},
"devDependencies": {
Expand Down

0 comments on commit 8d812bc

Please sign in to comment.