Merge remote-tracking branch 'origin/develop' into bare2share2

# Conflicts:
#	src/public/translations/en/translation.json
This commit is contained in:
Matt Wilkie
2025-02-17 13:54:40 -07:00
41 changed files with 409 additions and 460 deletions

View File

@@ -67,6 +67,7 @@ export interface OptionDefinitions extends KeyboardShortcutsOptions<KeyboardActi
maxContentWidth: number;
minTocHeadings: number;
eraseUnusedAttachmentsAfterSeconds: number;
eraseUnusedAttachmentsAfterTimeScale: number;
firstDayOfWeek: number;
initialized: boolean;