mirror of
https://github.com/zadam/trilium.git
synced 2025-06-06 18:08:33 +02:00

# Conflicts: # electron.js # package-lock.json # package.json # src/public/app/layouts/desktop_layout.js # src/public/app/widgets/note_tree.js # src/services/port.js