mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 02:16:05 +01:00 
			
		
		
		
	Merge branch 'develop' into feature/custom-datetime-format
This commit is contained in:
		| @@ -6,7 +6,6 @@ import searchService from "../../services/search/services/search.js"; | ||||
| import ValidationError from "../../errors/validation_error.js"; | ||||
| import type { Request } from "express"; | ||||
| import { changeLanguage, getLocales } from "../../services/i18n.js"; | ||||
| import { listSyntaxHighlightingThemes } from "../../services/code_block_theme.js"; | ||||
| import type { OptionNames } from "@triliumnext/commons"; | ||||
|  | ||||
| // options allowed to be updated directly in the Options dialog | ||||
| @@ -191,10 +190,6 @@ function getUserThemes() { | ||||
|     return ret; | ||||
| } | ||||
|  | ||||
| function getSyntaxHighlightingThemes() { | ||||
|     return listSyntaxHighlightingThemes(); | ||||
| } | ||||
|  | ||||
| function getSupportedLocales() { | ||||
|     return getLocales(); | ||||
| } | ||||
| @@ -211,6 +206,5 @@ export default { | ||||
|     updateOption, | ||||
|     updateOptions, | ||||
|     getUserThemes, | ||||
|     getSyntaxHighlightingThemes, | ||||
|     getSupportedLocales | ||||
| }; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user