Skip to content

Commit

Permalink
Merge pull request #951 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 Jan 19, 2024
2 parents 9cf605c + 61e76db commit 5746c26
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
"@mikro-orm/core": "^6.0.5",
"@mikro-orm/mariadb": "^6.0.4",
"@mikro-orm/reflection": "^6.0.5",
"@mikro-orm/sqlite": "^6.0.4",
"@mikro-orm/sqlite": "^6.0.5",
"ajv": "^8.12.0",
"ajv-formats": "^2.1.1",
"basic-ftp": "^5.0.4",
Expand Down
20 changes: 10 additions & 10 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 5746c26

Please sign in to comment.