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

# Conflicts:
#	packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
#	packages/frontend/src/scripts/mfm-tags.ts
This commit is contained in:
mattyatea 2023-11-17 13:28:42 +09:00
commit 7bc183cbb7
24 changed files with 518 additions and 489 deletions

View file

@ -509,6 +509,11 @@ export class MiMeta {
})
public enableFanoutTimeline: boolean;
@Column('boolean', {
default: true,
})
public enableFanoutTimelineDbFallback: boolean;
@Column('integer', {
default: 300,
})