Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
luxin committed Aug 31, 2020
2 parents a6fcbc4 + 50558c4 commit ed0d79b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
13 changes: 7 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
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"element-ui": "^2.13.0",
"kind-of": "^6.0.3",
"minimist": "^1.2.3",
"serialize-javascript": "^3.0.0",
"serialize-javascript": "^3.1.0",
"vue": "^2.6.11",
"vue-clipboard2": "^0.3.1",
"vue-router": "^3.1.6",
Expand Down

0 comments on commit ed0d79b

Please sign in to comment.