Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-11 15:55:52 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'master' into next61

Browse Source 
# Conflicts:
#	package-lock.json
#	src/public/app/services/note_content_renderer.js
#	src/public/app/widgets/note_tree.js
#	src/routes/routes.js
#	src/services/consistency_checks.js
#	src/services/notes.js
#	src/services/task_context.js
This commit is contained in:
zadam
2023-07-10 18:20:36 +02:00
parent b7b0bd80ed 6ec6d66f17
commit b7f0fd2db3
41 changed files with 253 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/public/app/widgets/icon_list.js
View File

@@ -9584,7 +9584,7 @@ const icons = [
"term": [
"honor",
"honour",
"acheivement"
"achievement"
]
},
{
@@ -9595,7 +9595,7 @@ const icons = [
"term": [
"honor",
"honour",
"acheivement"
"achievement"
]
},
{