Skip to content

Commit

Permalink
Merge branch 'master' into snyk-upgrade-d742b6805657a1101b65057f600c1102
Browse files Browse the repository at this point in the history
  • Loading branch information
Xavier Martínez Pujol committed Oct 6, 2019
2 parents d99c422 + 30b749f commit 2d30449
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"react-markdown": "^4.2.2",
"react-redux": "^7.1.1",
"react-router": "^5.1.1",
"react-router-dom": "^5.1.0",
"react-router-dom": "^5.1.1",
"react-syntax-highlighter": "^11.0.2",
"redux": "^4.0.4",
"redux-thunk": "^2.3.0",
Expand Down

0 comments on commit 2d30449

Please sign in to comment.