mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 02:16:05 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/stable' into syncification
# Conflicts: # package-lock.json # package.json # src/routes/custom.js # src/services/import/single.js
This commit is contained in:
		| @@ -778,5 +778,6 @@ module.exports = { | ||||
|     protectNoteRecursively, | ||||
|     scanForLinks, | ||||
|     duplicateNote, | ||||
|     getUndeletedParentBranches | ||||
|     getUndeletedParentBranches, | ||||
|     triggerNoteTitleChanged | ||||
| }; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user