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

conflict in - package-lock (accept incoming), - routes (remove the option to have image without filename, since it is not really necessary for canvas_note) - note_detail