Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into timer-show
Browse files Browse the repository at this point in the history
  • Loading branch information
Roundabout1 committed Aug 30, 2024
2 parents c9b9736 + 82bd2bc commit f86e485
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
9 changes: 4 additions & 5 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 @@ -37,7 +37,7 @@
"@electron-toolkit/utils": "^1.0.2",
"@floating-ui/react": "^0.26.9",
"@floating-ui/react-dom": "^2.0.8",
"@kruzhok-team/cyberiadaml-js": "^1.1.4",
"@kruzhok-team/cyberiadaml-js": "^1.1.5",
"@radix-ui/react-checkbox": "^1.0.4",
"@radix-ui/react-switch": "^1.0.3",
"@tweenjs/tween.js": "^23.1.1",
Expand Down

0 comments on commit f86e485

Please sign in to comment.