mirror of
				https://github.com/TriliumNext/Notes.git
				synced 2025-10-31 21:11:30 +08:00 
			
		
		
		
	Merge branch 'stable'
# Conflicts: # package.json
This commit is contained in:
		
						commit
						889cb1d7b1
					
				| @ -2,7 +2,7 @@ | ||||
|   "name": "trilium", | ||||
|   "productName": "Trilium Notes", | ||||
|   "description": "Trilium Notes", | ||||
|   "version": "0.61.10-beta", | ||||
|   "version": "0.61.11", | ||||
|   "license": "AGPL-3.0-only", | ||||
|   "main": "electron.js", | ||||
|   "bin": { | ||||
|  | ||||
							
								
								
									
										5
									
								
								spec/etapi/notes.spec.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								spec/etapi/notes.spec.js
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,5 @@ | ||||
| describe("Notes", () => { | ||||
|     it("zzz", () => { | ||||
| 
 | ||||
|     }); | ||||
| }); | ||||
| @ -1 +1 @@ | ||||
| module.exports = { buildDate:"2023-10-19T09:33:51+02:00", buildRevision: "b01fe5ead9268784fb133a8cfa53670927ba0e3b" }; | ||||
| module.exports = { buildDate:"2023-11-03T11:46:53+01:00", buildRevision: "01093d05d7ca1ede0c9af3fe2f5b04969ade816d" }; | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 zadam
						zadam