mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 10:26:08 +01:00 
			
		
		
		
	Merge branch 'master' into dev
# Conflicts: # package-lock.json # package.json # src/public/app/widgets/dialogs/note_revisions.js # src/services/handlers.js # src/services/hidden_subtree.js # src/services/search/services/parse.js
This commit is contained in:
		| @@ -1309,6 +1309,8 @@ export default class NoteTreeWidget extends NoteContextAwareWidget { | ||||
|             await this.tree.reload([rootNode]); | ||||
|         }); | ||||
|  | ||||
|         await this.filterHoistedBranch(); | ||||
|  | ||||
|         if (activeNotePath) { | ||||
|             const node = await this.getNodeFromPath(activeNotePath, true); | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user