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

# Conflicts: # packages/frontend/src/components/MkAbuseReport.vue
2024-02-19 22:05:40 +09:00 · 2024-02-19 22:05:40 +09:00 · cc69717f0d
commit cc69717f0d
parent fa8d6b43b3 9be3890827
28 changed files with 163 additions and 6 deletions
--- a/packages/backend/src/models/Meta.ts
+++ b/packages/backend/src/models/Meta.ts
@ -275,6 +275,8 @@ export class MiMeta {
 	})
 	public turnstileSecretKey: string | null;

+	// chaptcha系を追加した際にはnodeinfoのレスポンスに追加するのを忘れないようにすること
+
 	@Column('enum', {
 		enum: ['none', 'all', 'local', 'remote'],
 		default: 'none',