Skip to content

Commit

Permalink
Merge branch 'main' into feat/zoom-buttons
Browse files Browse the repository at this point in the history
  • Loading branch information
afonsojramos authored Jul 7, 2024
2 parents edd6642 + d456a1a commit 1228182
Show file tree
Hide file tree
Showing 13 changed files with 191 additions and 145 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
"@electron/remote": "2.1.2",
"@primer/octicons-react": "19.10.0",
"axios": "1.7.2",
"class-variance-authority": "^0.7.0",
"class-variance-authority": "0.7.0",
"clsx": "2.1.1",
"date-fns": "3.6.0",
"electron-updater": "6.2.1",
Expand All @@ -114,7 +114,7 @@
"react-dom": "18.3.1",
"react-final-form": "6.5.9",
"react-router-dom": "6.24.1",
"tailwind-merge": "^2.3.0",
"tailwind-merge": "2.3.0",
"ts-loader": "9.5.1",
"typescript": "5.5.3"
},
Expand All @@ -123,7 +123,7 @@
"@electron/notarize": "2.3.2",
"@testing-library/react": "16.0.0",
"@types/jest": "29.5.12",
"@types/node": "20.14.9",
"@types/node": "20.14.10",
"@types/nprogress": "0.2.3",
"@types/react": "18.3.3",
"@types/react-router-dom": "5.3.3",
Expand All @@ -138,7 +138,7 @@
"nock": "13.5.4",
"postcss": "8.4.39",
"postcss-loader": "8.1.1",
"resize-observer-polyfill": "^1.5.1",
"resize-observer-polyfill": "1.5.1",
"rimraf": "5.0.7",
"style-loader": "4.0.0",
"tailwindcss": "3.4.4",
Expand Down
Loading

0 comments on commit 1228182

Please sign in to comment.