mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-30 19:19:03 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/stable'
This commit is contained in:
		
						commit
						a254199746
					
				| @ -2,7 +2,7 @@ | ||||
|   "name": "trilium", | ||||
|   "productName": "Trilium Notes", | ||||
|   "description": "Trilium Notes", | ||||
|   "version": "0.46.5", | ||||
|   "version": "0.46.6", | ||||
|   "license": "AGPL-3.0-only", | ||||
|   "main": "electron.js", | ||||
|   "bin": { | ||||
|  | ||||
| @ -359,7 +359,7 @@ class NoteShort { | ||||
|         const workspaceIconClass = this.getWorkspaceIconClass(); | ||||
| 
 | ||||
|         if (iconClassLabels.length > 0) { | ||||
|             return iconClassLabels.map(l => l.value).join(' '); | ||||
|             return iconClassLabels[0].value; | ||||
|         } | ||||
|         else if (workspaceIconClass) { | ||||
|             return workspaceIconClass; | ||||
|  | ||||
| @ -1 +1 @@ | ||||
| module.exports = { buildDate:"2021-03-14T22:56:27+01:00", buildRevision: "6c8d20288df302f3a415bd1bdcace98bf29d4bf6" }; | ||||
| module.exports = { buildDate:"2021-03-25T20:28:57+01:00", buildRevision: "9139c597e549add45aafdb70f461d6bc39f975d9" }; | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 zadam
						zadam