Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-18 03:00:41 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'beta'

Browse Source 
# Conflicts:
#	package.json
#	src/public/app/layouts/desktop_layout.js
This commit is contained in:
zadam
2023-10-20 09:15:48 +02:00
parent 52244ddc99 38db7f9db7
commit 5c10fc26be
16 changed files with 100 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/services/backup.js
View File

@@ -21,7 +21,7 @@ function getExistingBackups() {
const filePath = path.resolve(dataDir.BACKUP_DIR, fileName);
const stat = fs.statSync(filePath)
return {fileName, filePath, ctime: stat.ctime};
return {fileName, filePath, mtime: stat.mtime};
});
}

2
src/services/build.js
View File

@@ -1 +1 @@
module.exports = { buildDate:"2023-10-07T23:02:47+03:00", buildRevision: "3d15aeae58224ac8716dd58938458e89af9bf7a0" };
module.exports = { buildDate:"2023-10-19T09:33:51+02:00", buildRevision: "b01fe5ead9268784fb133a8cfa53670927ba0e3b" };