Skip to content

Commit

Permalink
Merge branch 'master' into feat-nojekyll-cname
Browse files Browse the repository at this point in the history
  • Loading branch information
peaceiris committed Feb 21, 2020
2 parents 51f0d4c + 6244b19 commit da016e1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 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 @@ -60,7 +60,7 @@
"@types/node": "~12",
"@typescript-eslint/eslint-plugin": "^2.20.0",
"@typescript-eslint/parser": "^2.20.0",
"@zeit/ncc": "^0.21.0",
"@zeit/ncc": "^0.21.1",
"eslint": "^6.8.0",
"eslint-plugin-jest": "^23.7.0",
"husky": "^4.2.3",
Expand Down

0 comments on commit da016e1

Please sign in to comment.