mirror of
https://github.com/zadam/trilium.git
synced 2025-03-01 14:22:32 +01:00

# Conflicts: # src/etapi/etapi.openapi.yaml # src/etapi/notes.js # src/public/app/widgets/type_widgets/editable_text.js # src/services/app_info.js