mirror of
https://github.com/TriliumNext/Notes.git
synced 2025-09-18 17:31:53 +08: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