mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 18:36:30 +01:00 
			
		
		
		
	Merge branch 'main' of https://github.com/TriliumNext/trilium
This commit is contained in:
		| @@ -18,7 +18,7 @@ | |||||||
|     } |     } | ||||||
|   }, |   }, | ||||||
|   "devDependencies": { |   "devDependencies": { | ||||||
|     "dotenv": "17.1.0", |     "dotenv": "17.2.0", | ||||||
|     "electron": "37.2.0" |     "electron": "37.2.0" | ||||||
|   } |   } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -17,6 +17,6 @@ | |||||||
|     } |     } | ||||||
|   }, |   }, | ||||||
|   "devDependencies": { |   "devDependencies": { | ||||||
|     "dotenv": "17.1.0" |     "dotenv": "17.2.0" | ||||||
|   } |   } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -88,7 +88,7 @@ | |||||||
|     "multer": "2.0.1", |     "multer": "2.0.1", | ||||||
|     "normalize-strings": "1.1.1", |     "normalize-strings": "1.1.1", | ||||||
|     "ollama": "0.5.16", |     "ollama": "0.5.16", | ||||||
|     "openai": "5.8.3", |     "openai": "5.9.0", | ||||||
|     "rand-token": "1.0.1", |     "rand-token": "1.0.1", | ||||||
|     "safe-compare": "1.1.4", |     "safe-compare": "1.1.4", | ||||||
|     "sanitize-filename": "1.6.3", |     "sanitize-filename": "1.6.3", | ||||||
|   | |||||||
| @@ -62,6 +62,6 @@ | |||||||
|     "codemirror-lang-elixir": "4.0.0", |     "codemirror-lang-elixir": "4.0.0", | ||||||
|     "codemirror-lang-hcl": "0.1.0", |     "codemirror-lang-hcl": "0.1.0", | ||||||
|     "codemirror-lang-mermaid": "0.5.0", |     "codemirror-lang-mermaid": "0.5.0", | ||||||
|     "eslint-linter-browserify": "9.30.1" |     "eslint-linter-browserify": "9.31.0" | ||||||
|   } |   } | ||||||
| } | } | ||||||
|   | |||||||
							
								
								
									
										850
									
								
								pnpm-lock.yaml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										850
									
								
								pnpm-lock.yaml
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
		Reference in New Issue
	
	Block a user