merge: upstream

2023-10-31 19:33:24 +01:00 · 2023-10-31 19:33:24 +01:00 · 4dd23a3793
commit 4dd23a3793
parent c491385f2e bf01c1ee64
217 changed files with 6773 additions and 2275 deletions
--- a/packages/backend/src/models/Meta.ts
+++ b/packages/backend/src/models/Meta.ts
@ -504,6 +504,11 @@ export class MiMeta {
 	})
 	public preservedUsernames: string[];

+	@Column('boolean', {
+		default: true,
+	})
+	public enableFanoutTimeline: boolean;
+
 	@Column('integer', {
 		default: 300,
 	})