Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'refs/remotes/misskey-original/develop' into develop

Browse source 
# Conflicts:
#	CHANGELOG.md
#	packages/backend/src/core/activitypub/models/ApNoteService.ts
#	packages/backend/src/core/entities/AbuseUserReportEntityService.ts
#	packages/frontend/src/components/MkNotification.vue
#	packages/frontend/src/pages/user/home.vue
#	pnpm-lock.yaml
This commit is contained in:
mattyatea 2024-06-25 07:11:15 +09:00
commit fd4fd5aa7b
81 changed files with 493 additions and 557 deletions
Download patch file Download diff file Expand all files Collapse all files

3
packages/backend/package.json
View file

@ -178,7 +178,7 @@
"tsc-alias": "1.8.8",
"tsconfig-paths": "4.2.0",
"typeorm": "0.3.20",
"typescript": "5.4.5",
"typescript": "5.5.2",
"ulid": "2.3.0",
"vary": "1.1.2",
"w3c-xmlserializer": "^5.0.0",
@ -209,7 +209,6 @@
"@types/mime-types": "2.1.4",
"@types/ms": "0.7.34",
"@types/node": "20.12.7",
"@types/node-fetch": "3.0.3",
"@types/nodemailer": "6.4.15",
"@types/oauth": "0.9.4",
"@types/oauth2orize": "1.11.5",