mirror of
https://github.com/zadam/trilium.git
synced 2025-12-17 21:04:24 +01:00
# Conflicts: # package-lock.json # src/public/javascripts/services/server.js # src/services/app_info.js # src/services/notes.js
# Conflicts: # package-lock.json # src/public/javascripts/services/server.js # src/services/app_info.js # src/services/notes.js