Merge branch 'stable' into hoist

This commit is contained in:
azivner 2018-12-13 21:18:44 +01:00
commit e73e1262ae
2 changed files with 2 additions and 2 deletions

View File

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

View File

@ -1 +1 @@
module.exports = { buildDate:"2018-12-09T21:22:33+01:00", buildRevision: "492adc29092cbc6ff7a79ef4fec542e6da1769a8" }; module.exports = { buildDate:"2018-12-12T21:30:06+01:00", buildRevision: "d30e3a405262a16bdfa8c205e6607ec69211dd00" };