mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 18:36:30 +01:00 
			
		
		
		
	Merge branch 'master' into next61
# Conflicts: # package-lock.json # src/public/app/services/note_content_renderer.js # src/public/app/widgets/note_tree.js # src/routes/routes.js # src/services/consistency_checks.js # src/services/notes.js # src/services/task_context.js
This commit is contained in:
		| @@ -166,7 +166,7 @@ export default class NoteMapWidget extends NoteContextAwareWidget { | ||||
|  | ||||
|     generateColorFromString(str) { | ||||
|         if (this.themeStyle === "dark") { | ||||
|             str = `0${str}`; // magic lightening modifier | ||||
|             str = `0${str}`; // magic lightning modifier | ||||
|         } | ||||
|  | ||||
|         let hash = 0; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user