mirror of
https://github.com/zadam/trilium.git
synced 2024-09-20 15:45:58 +08:00
Merge remote-tracking branch 'origin/stable' into redesign
This commit is contained in:
commit
855b876d50
|
@ -1,4 +1,4 @@
|
|||
FROM node:12.19.0-alpine
|
||||
FROM node:14.17.0-alpine
|
||||
|
||||
# Create app directory
|
||||
WORKDIR /usr/src/app
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
"name": "trilium",
|
||||
"productName": "Trilium Notes",
|
||||
"description": "Trilium Notes",
|
||||
"version": "0.47.3",
|
||||
"version": "0.47.4",
|
||||
"license": "AGPL-3.0-only",
|
||||
"main": "electron.js",
|
||||
"bin": {
|
||||
|
|
|
@ -1 +1 @@
|
|||
module.exports = { buildDate:"2021-05-15T23:05:20+02:00", buildRevision: "f6dd1110e842a8b84f2bbdaadad315763045c152" };
|
||||
module.exports = { buildDate:"2021-06-02T21:44:19+02:00", buildRevision: "f50bb2278caaea077b2273356808c173e8548ded" };
|
||||
|
|
Loading…
Reference in a new issue