Merge remote-tracking branch 'origin/stable'

.idea/codeStyles/Project.xml

@@ -6,9 +6,6 @@
         <option name="TAB_SIZE" value="2" />
       </value>
     </option>
-    <H2CodeStyleSettings version="5">
-      <option name="USE_GENERAL_STYLE" value="false" />
-    </H2CodeStyleSettings>
     <JSCodeStyleSettings version="0">
       <option name="USE_EXPLICIT_JS_EXTENSION" value="TRUE" />
     </JSCodeStyleSettings>

package-lock.json

@@ -2654,9 +2654,9 @@
       }
     },
     "electron": {
-      "version": "9.3.3",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-9.3.3.tgz",
-      "integrity": "sha512-xghKeUY1qgnEcJ5w2rXo/toH+8NT2Dktx2aAxBNPV7CIJr3mejJJAPwLbycwtddzr37tgKxHeHlc8ivfKtMkJQ==",
+      "version": "9.3.4",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-9.3.4.tgz",
+      "integrity": "sha512-OHP8qMKgW8D8GtH+altB22WJw/lBOyyVdoz5e8D0/iPBmJU3Jm93vO4z4Eh/9DvdSXlH8bMHUCMLL9PVW6f+tw==",
       "dev": true,
       "requires": {
         "@electron/get": "^1.0.1",

package.json

@@ -2,7 +2,7 @@
   "name": "trilium",
   "productName": "Trilium Notes",
   "description": "Trilium Notes",
-  "version": "0.45.2",
+  "version": "0.45.3",
   "license": "AGPL-3.0-only",
   "main": "electron.js",
   "bin": {
@@ -76,7 +76,7 @@
   },
   "devDependencies": {
     "cross-env": "7.0.2",
-    "electron": "9.3.3",
+    "electron": "9.3.4",
     "electron-builder": "22.9.1",
     "electron-packager": "15.1.0",
     "electron-rebuild": "2.3.2",

src/services/build.js

@@ -1 +1 @@
-module.exports = { buildDate:"2020-10-29T22:57:25+01:00", buildRevision: "4f75b6aaafef8144080fd17f403a605f61f5590d" };
+module.exports = { buildDate:"2020-11-10T22:54:39+01:00", buildRevision: "5157fc15e9f7fa960ee35685426868d5599933dc" };