Skip to content

Commit

Permalink
Merge branch 'master' into snyk-upgrade-1e47933cddf0791692108fbcc00cfa4f
Browse files Browse the repository at this point in the history
  • Loading branch information
tghelere committed Feb 20, 2020
2 parents e830d26 + 096fc60 commit f557802
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
Expand Up @@ -31,7 +31,7 @@
"@fortawesome/fontawesome-free-solid": "^5.0.13",
"@fortawesome/fontawesome-svg-core": "^1.2.8",
"@fortawesome/free-solid-svg-icons": "^5.5.0",
"@fortawesome/vue-fontawesome": "^0.1.3",
"@fortawesome/vue-fontawesome": "^0.1.9",
"bulma": "^0.7.2",
"normalize.css": "^8.0.1",
"vue": "^2.6.11",
Expand Down

0 comments on commit f557802

Please sign in to comment.