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

Merge branch 'stable'

Browse Source 
# Conflicts:
#	package-lock.json
#	package.json
This commit is contained in:
zadam
2019-08-15 08:52:34 +02:00
parent 963ed32ce4 5406b09f3a
commit 61520bc3b3
14 changed files with 126 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/services/build.js
View File

@@ -1 +1 @@
module.exports = { buildDate:"2019-08-01T21:37:59+02:00", buildRevision: "4dd6352aec73db55852068ec146ee0f39bce4027" };
module.exports = { buildDate:"2019-08-13T21:48:56+02:00", buildRevision: "90f1bfb3e4838cfea676c7968473c6978ecbed1b" };

2
src/services/script_context.js
View File

@@ -11,7 +11,7 @@ function ScriptContext(allNotes, apiParams = {}) {
const note = candidates.find(c => c.title === moduleName);
if (!note) {
throw new Error("Could not find module note " + moduleName);
return require(moduleName);
}
return this.modules[note.noteId].exports;