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:
commit
7bc183cbb7
24 changed files with 518 additions and 489 deletions
|
|
@ -509,6 +509,11 @@ export class MiMeta {
|
|||
})
|
||||
public enableFanoutTimeline: boolean;
|
||||
|
||||
@Column('boolean', {
|
||||
default: true,
|
||||
})
|
||||
public enableFanoutTimelineDbFallback: boolean;
|
||||
|
||||
@Column('integer', {
|
||||
default: 300,
|
||||
})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue