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

# Conflicts:
#	package.json
#	packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
#	packages/frontend/package.json

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,
 	})