Merge branch 'develop' into merge/2024-02-03

# Conflicts:
#	packages/backend/src/server/ActivityPubServerService.ts
#	pnpm-lock.yaml
This commit is contained in:
Hazelnoot 2025-02-08 13:16:17 -05:00
commit 7e1b4b259a
18 changed files with 727 additions and 689 deletions

View file

@ -81,7 +81,6 @@
"@fastify/view": "10.0.1",
"@misskey-dev/sharp-read-bmp": "1.2.0",
"@misskey-dev/summaly": "5.1.0",
"@napi-rs/canvas": "0.1.56",
"@nestjs/common": "10.4.7",
"@nestjs/core": "10.4.7",
"@nestjs/testing": "10.4.7",
@ -106,6 +105,7 @@
"body-parser": "1.20.3",
"bullmq": "5.26.1",
"cacheable-lookup": "7.0.0",
"canvas": "^3.1.0",
"cbor": "9.0.2",
"chalk": "5.3.0",
"chalk-template": "1.1.0",