Skip to content

Commit

Permalink
Merge branch 'master' into snyk-upgrade-36cc8a8742df60589de53ae393d0912d
Browse files Browse the repository at this point in the history
  • Loading branch information
Xavier Martínez Pujol committed Oct 7, 2019
2 parents bf8a6a7 + 96f4109 commit e55861a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 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 @@ -6,7 +6,7 @@
"dependencies": {
"fetch-jsonp": "^1.1.3",
"react": "^16.10.1",
"react-dom": "^16.9.0",
"react-dom": "^16.10.1",
"react-markdown": "^4.2.2",
"react-redux": "^7.1.1",
"react-router": "^5.1.0",
Expand Down

0 comments on commit e55861a

Please sign in to comment.