Merge remote-tracking branch 'origin/stable'

# Conflicts:
#	package-lock.json
#	package.json
This commit is contained in:
zadam 2021-10-05 19:45:32 +02:00
commit 0654dc855f
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.47.7", "version": "0.47.8",
"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:"2021-08-22T12:36:49+02:00", buildRevision: "08eda83700038b4a658d6830dcf8e34d1bcfbc0f" }; module.exports = { buildDate:"2021-10-04T22:18:33+02:00", buildRevision: "1f75b9c92f1f695e4f43230f88d676ab8a0b39c0" };