Merge branch 'master' into next61

# Conflicts:
#	package-lock.json
#	package.json
#	src/public/app/components/note_context.js
#	src/public/app/services/open.js
#	src/public/app/widgets/buttons/note_actions.js
#	src/public/app/widgets/find_in_code.js
#	src/public/app/widgets/type_widgets/canvas.js
#	src/services/options.js

package.json

@@ -2,7 +2,7 @@
   "name": "trilium",
   "productName": "Trilium Notes",
   "description": "Trilium Notes",
-  "version": "0.59.4",
+  "version": "0.60.0-beta",
   "license": "AGPL-3.0-only",
   "main": "electron.js",
   "bin": {
@@ -28,7 +28,7 @@
     "test": "npm run test-jasmine && npm run test-es6",
     "postinstall": "rimraf ./node_modules/canvas",
     "lint": "eslint .  --cache",
-    "prepare": "husky install"
+    "prepare": "husky install || echo 'Husky install failed, expected on flatpak build'"
   },
   "dependencies": {
     "@braintree/sanitize-url": "6.0.2",
@@ -45,8 +45,8 @@
     "cookie-parser": "1.4.6",
     "csurf": "1.11.0",
     "dayjs": "1.11.7",
-    "dayjs-plugin-utc": "^0.1.2",
-    "debounce": "^1.2.1",
+    "dayjs-plugin-utc": "0.1.2",
+    "debounce": "1.2.1",
     "ejs": "3.1.9",
     "electron-debug": "3.2.0",
     "electron-dl": "3.5.0",