Skip to content

Commit

Permalink
Merge branch 'mainsail-crew:develop' into ToolChangerButtonsInExtrude…
Browse files Browse the repository at this point in the history
…rControlPanel
  • Loading branch information
TypQxQ authored Sep 19, 2023
2 parents 6d7f368 + 7ae9589 commit de7b6ea
Show file tree
Hide file tree
Showing 2 changed files with 80 additions and 74 deletions.
152 changes: 79 additions & 73 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 @@ -82,7 +82,7 @@
"@typescript-eslint/parser": "^5.11.0",
"@vue/eslint-config-typescript": "^11.0.0",
"autoprefixer": "^10.4.2",
"cypress": "^10.0.0",
"cypress": "^13.2.0",
"eslint": "^8.9.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-jsonc": "^2.2.1",
Expand Down

0 comments on commit de7b6ea

Please sign in to comment.