Skip to content

Commit

Permalink
feat: merge branch 'develop' into staging
Browse files Browse the repository at this point in the history
# Conflicts:
#	api/pnpm-lock.yaml
  • Loading branch information
acaldas committed Jun 12, 2024
2 parents 49981f2 + 319152e commit c42b2be
Show file tree
Hide file tree
Showing 2 changed files with 7,337 additions and 5,893 deletions.
2 changes: 1 addition & 1 deletion api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"body-parser": "^1.20.2",
"cookie-parser": "^1.4.6",
"cors": "^2.8.5",
"document-drive": "1.0.0-alpha.73",
"document-drive": "1.0.0-alpha.74",
"document-model": "1.5.0",
"document-model-libs": "^1.58.0",
"dotenv": "^16.4.5",
Expand Down
Loading

0 comments on commit c42b2be

Please sign in to comment.