Skip to content

Commit

Permalink
Merge pull request #741 from SAP/combined-prs-branch
Browse files Browse the repository at this point in the history
Combined PRs
  • Loading branch information
Jérôme Benoit authored Sep 22, 2023
2 parents dce5674 + b9a7d59 commit 7337283
Show file tree
Hide file tree
Showing 4 changed files with 134 additions and 41 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
"dependencies": {
"@mikro-orm/core": "^5.8.1",
"@mikro-orm/mariadb": "^5.8.2",
"@mikro-orm/reflection": "^5.8.1",
"@mikro-orm/reflection": "^5.8.2",
"@mikro-orm/sqlite": "^5.8.1",
"ajv": "^8.12.0",
"ajv-formats": "^2.1.1",
Expand All @@ -128,7 +128,7 @@
"devDependencies": {
"@commitlint/cli": "^17.7.1",
"@commitlint/config-conventional": "^17.7.0",
"@mikro-orm/cli": "^5.8.1",
"@mikro-orm/cli": "^5.8.2",
"@release-it/bumper": "^5.1.0",
"@rollup/plugin-json": "^6.0.0",
"@rollup/plugin-terser": "^0.4.3",
Expand Down
113 changes: 103 additions & 10 deletions pnpm-lock.yaml

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

2 changes: 1 addition & 1 deletion ui/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"rimraf": "^5.0.1",
"typescript": "~5.2.2",
"vite": "^4.4.9",
"vitest": "^0.34.4"
"vitest": "^0.34.5"
},
"_id": "[email protected]"
}
56 changes: 28 additions & 28 deletions ui/web/pnpm-lock.yaml

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

0 comments on commit 7337283

Please sign in to comment.