Merge branch 'stable'

This commit is contained in:
zadam 2019-11-01 19:21:55 +01:00
commit 5c05963bd9
3 changed files with 6 additions and 2 deletions

View file

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

View file

@ -45,6 +45,10 @@ class Branch extends Entity {
this.notePosition = maxNotePos === null ? 0 : maxNotePos + 10;
}
if (!this.isExpanded) {
this.isExpanded = false;
}
if (!this.isDeleted) {
this.isDeleted = false;
}

View file

@ -1 +1 @@
module.exports = { buildDate:"2019-10-21T21:59:17+02:00", buildRevision: "132360b46bfd326d8f50d71fed04ab4af969f3cb" };
module.exports = { buildDate:"2019-10-31T22:04:44+01:00", buildRevision: "f1a7fce277d963977b73e3d183d700021781e913" };