Skip to content

Commit

Permalink
Merge branch 'main' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
shaes-farm committed Aug 18, 2023
2 parents fb3b64f + df67220 commit cb727a5
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 21 deletions.
8 changes: 4 additions & 4 deletions example/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 example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@mui/material": "^5.14.2",
"@shaes-farm/mui-mas": "file:..",
"@types/node": "20.4.5",
"@types/react": "18.2.16",
"@types/react": "18.2.17",
"@types/react-dom": "18.2.7",
"eslint": "8.45.0",
"eslint-config-next": "13.4.12",
Expand Down
27 changes: 13 additions & 14 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@
"@fontsource/roboto": "5.0.5",
"@mui/icons-material": "5.14.1",
"@mui/lab": "5.0.0-alpha.135",
"@mui/material": "^5.14.1",
"@mui/material": "^5.14.2",
"@supabase/auth-helpers-react": "0.4.1",
"@supabase/supabase-js": "2.29.0",
"@supabase/supabase-js": "2.31.0",
"clsx": "1.2.1",
"next": "13.2.4",
"react": "^18.2.0",
Expand Down

0 comments on commit cb727a5

Please sign in to comment.