mirror of
https://github.com/zadam/trilium.git
synced 2025-03-01 14:22:32 +01:00
Merge branch 'stable'
# Conflicts: # package.json # src/services/build.js
This commit is contained in:
commit
296cb7236f
# Conflicts: # package.json # src/services/build.js