mirror of
https://github.com/zadam/trilium.git
synced 2025-03-01 14:22:32 +01:00

# Conflicts: # src/public/app/widgets/containers/root_container.js # src/services/app_info.js
# Conflicts: # src/public/app/widgets/containers/root_container.js # src/services/app_info.js