Skip to content

Commit

Permalink
Merge branch 'master' into localization
Browse files Browse the repository at this point in the history
  • Loading branch information
headironc authored Nov 24, 2024
2 parents a6e3883 + 750fb38 commit c0beda5
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
"@mui/internal-markdown": "^1.0.20",
"@mui/internal-test-utils": "^1.0.21",
"@mui/material": "^5.16.7",
"@mui/monorepo": "github:mui/material-ui#a0ffee42815b110e14107249f193b7505d1761e5",
"@mui/monorepo": "github:mui/material-ui#f706939f7ce7fd90d8d4436515d752daff7395c6",
"@mui/utils": "^5.16.6",
"@next/eslint-plugin-next": "15.0.3",
"@octokit/plugin-retry": "^7.1.2",
Expand All @@ -108,7 +108,7 @@
"@types/fs-extra": "^11.0.4",
"@types/karma": "^6.3.9",
"@types/lodash": "^4.17.13",
"@types/mocha": "^10.0.9",
"@types/mocha": "^10.0.10",
"@types/node": "^20.17.6",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/rsc-builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"yargs": "^17.7.2"
},
"devDependencies": {
"@types/mocha": "^10.0.9",
"@types/mocha": "^10.0.10",
"@types/node": "^20.17.6"
}
}
38 changes: 19 additions & 19 deletions pnpm-lock.yaml

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

0 comments on commit c0beda5

Please sign in to comment.