mirror of
https://github.com/zadam/trilium.git
synced 2025-03-01 14:22:32 +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