Merge remote-tracking branch 'origin/stable'

# Conflicts: # package.json # src/services/build.js
2025-11-12 08:15:52 +01:00 · 2021-12-31 20:16:31 +01:00
parent a910034c96 067251861d
commit dad82ea4e8
8 changed files with 5761 additions and 4 deletions
--- a/src/routes/api/options.js
+++ b/src/routes/api/options.js
@@ -33,6 +33,7 @@ const ALLOWED_OPTIONS = new Set([
    'similarNotesWidget',
    'editedNotesWidget',
    'calendarWidget',
+    'vimKeymapEnabled',
    'codeNotesMimeTypes',
    'spellCheckEnabled',
    'spellCheckLanguageCode',