mirror of
https://github.com/zadam/trilium.git
synced 2026-01-18 12:34:24 +01:00
# Conflicts: # src/public/javascripts/desktop.js # src/views/desktop.ejs # src/views/mobile.ejs
# Conflicts: # src/public/javascripts/desktop.js # src/views/desktop.ejs # src/views/mobile.ejs