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

# Conflicts:
#	package-lock.json
#	src/public/app/widgets/mermaid.js
This commit is contained in:
zadam
2023-02-15 23:47:41 +01:00
5 changed files with 48 additions and 40 deletions

View File

@@ -2,7 +2,7 @@
"name": "trilium",
"productName": "Trilium Notes",
"description": "Trilium Notes",
"version": "0.58.7",
"version": "0.58.8",
"license": "AGPL-3.0-only",
"main": "electron.js",
"bin": {