mirror of
				https://github.com/TriliumNext/Notes.git
				synced 2025-10-31 13:01:31 +08:00 
			
		
		
		
	Merge branch 'stable'
This commit is contained in:
		
						commit
						e7470e31a0
					
				| @ -2,7 +2,7 @@ | |||||||
|   "name": "trilium", |   "name": "trilium", | ||||||
|   "productName": "Trilium Notes", |   "productName": "Trilium Notes", | ||||||
|   "description": "Trilium Notes", |   "description": "Trilium Notes", | ||||||
|   "version": "0.57.3", |   "version": "0.57.5", | ||||||
|   "license": "AGPL-3.0-only", |   "license": "AGPL-3.0-only", | ||||||
|   "main": "electron.js", |   "main": "electron.js", | ||||||
|   "bin": { |   "bin": { | ||||||
|  | |||||||
| @ -1 +1 @@ | |||||||
| module.exports = { buildDate:"2022-12-02T22:44:40+01:00", buildRevision: "42cd33369407a1a64eeeced4a0729b5fcd7cac47" }; | module.exports = { buildDate:"2022-12-13T23:08:52+01:00", buildRevision: "921f75beba6ac71d767f6b723692c73c1cd5f70e" }; | ||||||
|  | |||||||
| @ -53,6 +53,11 @@ function init(httpServer, sessionParser) { | |||||||
|             } |             } | ||||||
|         }); |         }); | ||||||
|     }); |     }); | ||||||
|  | 
 | ||||||
|  |     webSocketServer.on('error', error => { | ||||||
|  |         // https://github.com/zadam/trilium/issues/3374#issuecomment-1341053765
 | ||||||
|  |         console.log(error); | ||||||
|  |     }); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| function sendMessage(client, message) { | function sendMessage(client, message) { | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 zadam
						zadam