Skip to content

Commit

Permalink
Merge pull request #732 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 21, 2023
2 parents ae3a41a + 7cbeac0 commit 8ba3243
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 35 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
"basic-ftp": "^5.0.3",
"chalk": "^5.3.0",
"date-fns": "^2.30.0",
"http-status-codes": "^2.2.0",
"http-status-codes": "^2.3.0",
"just-merge": "^3.2.0",
"logform": "^2.5.1",
"mnemonist": "^0.39.5",
Expand All @@ -135,7 +135,7 @@
"@rollup/plugin-typescript": "^11.1.3",
"@types/mocha": "^10.0.1",
"@types/mochawesome": "^6.2.1",
"@types/node": "^20.6.2",
"@types/node": "^20.6.3",
"@types/sinon": "^10.0.16",
"@types/tar": "^6.1.6",
"@types/ws": "^8.5.5",
Expand Down
34 changes: 17 additions & 17 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 @@ -39,7 +39,7 @@
"devDependencies": {
"@tsconfig/node20": "^20.1.2",
"@types/jsdom": "^21.1.3",
"@types/node": "^20.6.2",
"@types/node": "^20.6.3",
"@typescript-eslint/eslint-plugin": "^6.7.2",
"@typescript-eslint/parser": "^6.7.2",
"@vitejs/plugin-vue": "^4.3.4",
Expand Down
30 changes: 15 additions & 15 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 8ba3243

Please sign in to comment.