Skip to content

Commit

Permalink
Merge branch 'master' into remove-home-thumbs
Browse files Browse the repository at this point in the history
  • Loading branch information
Pomax authored Nov 15, 2018
2 parents 85a9bf9 + 05e4079 commit ffc0a24
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 31 deletions.
55 changes: 25 additions & 30 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 @@ -66,7 +66,7 @@
"react-ga": "2.5.3",
"shelljs": "^0.8.2",
"shx": "^0.3.2",
"snyk": "^1.108.0",
"snyk": "^1.108.2",
"stylelint": "^9.7.1",
"stylelint-config-standard": "^18.2.0",
"svgo": "^1.1.1",
Expand Down

0 comments on commit ffc0a24

Please sign in to comment.