Skip to content

Commit

Permalink
Merge branch 'master' into snyk-upgrade-1db02a930081e1352823fd15cf42c3f7
Browse files Browse the repository at this point in the history
  • Loading branch information
ThornWalli authored Oct 18, 2019
2 parents 97f0c15 + 090e14e commit 42dadee
Show file tree
Hide file tree
Showing 2 changed files with 168 additions and 47 deletions.
211 changes: 166 additions & 45 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"@storybook/addon-actions": "^5.2.1",
"@storybook/addon-links": "^5.2.3",
"@storybook/addon-viewport": "^5.2.3",
"@storybook/addons": "^5.2.1",
"@storybook/addons": "^5.2.3",
"@storybook/vue": "^5.2.1",
"babel-eslint": "^10.0.3",
"babel-loader": "^8.0.6",
Expand Down Expand Up @@ -105,7 +105,7 @@
"picturefill": "^3.0.3",
"rxjs": "^6.5.3",
"vue-lazy-hydration": "^1.0.0-beta.9",
"snyk": "^1.231.0"
"snyk": "^1.234.0"
},
"snyk": true
}

0 comments on commit 42dadee

Please sign in to comment.