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

Merge branch 'master' into next61

Browse Source 
# Conflicts:
#	package-lock.json
#	src/routes/api/recent_changes.js
This commit is contained in:
zadam
2023-06-13 23:25:35 +02:00
parent 38839532d5 6f16b4caec
commit ac56056f65
12 changed files with 1673 additions and 1146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/routes/routes.js
View File

@@ -69,6 +69,7 @@ const etapiBranchRoutes = require('../etapi/branches');
const etapiNoteRoutes = require('../etapi/notes');
const etapiSpecialNoteRoutes = require('../etapi/special_notes');
const etapiSpecRoute = require('../etapi/spec');
const etapiBackupRoute = require('../etapi/backup');
const csrfMiddleware = csurf({
cookie: true,
@@ -340,6 +341,7 @@ function register(app) {
etapiNoteRoutes.register(router);
etapiSpecialNoteRoutes.register(router);
etapiSpecRoute.register(router);
etapiBackupRoute.register(router);
app.use('', router);
}