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

Merge remote-tracking branch 'origin/master' into dev

Browse Source 
# Conflicts:
#	package-lock.json
#	src/public/app/widgets/mermaid.js
This commit is contained in:
zadam
2023-02-15 23:47:41 +01:00
parent 127486fdf5 22cea63863
commit 42e08284b0
5 changed files with 48 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/public/app/widgets/buttons/global_menu.js
View File

@@ -85,6 +85,7 @@ const TPL = `
font-size: 90%;
position: relative;
left: 0;
top: 5px;
}
</style>