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

Merge remote-tracking branch 'origin/stable'

Browse Source 
# Conflicts:
#	package.json
#	src/services/build.js
This commit is contained in:
zadam
2021-12-31 20:16:31 +01:00
parent a910034c96 067251861d
commit dad82ea4e8
8 changed files with 5761 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/services/import/opml.js
View File

@@ -51,7 +51,7 @@ async function importOpml(taskContext, fileBuffer, parentNote) {
throw new Error("Unrecognized OPML version " + opmlVersion);
}
content = htmlSanitizer.sanitize(content);
content = htmlSanitizer.sanitize(content || "");
const {note} = noteService.createNewNote({
parentNoteId,