gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source 
# Conflicts:
#	src/entities/note.js
This commit is contained in:
zadam 2019-11-11 20:43:00 +01:00
commit 5b4a2bd71c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

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

2
src/services/build.js
View File

@ -1 +1 @@
module.exports = { buildDate:"2019-11-09T21:19:34+01:00", buildRevision: "c2ebd4b308d712b3f4cff99019c559ccab0e49b7" }; module.exports = { buildDate:"2019-11-10T22:20:54+01:00", buildRevision: "b5a0cadcf45e51377573c12b939a1654b09f4931" };