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

Merge remote-tracking branch 'origin/stable' into syncification

Browse Source 
# Conflicts:
#	package-lock.json
#	package.json
#	src/routes/custom.js
#	src/services/import/single.js
This commit is contained in:
zadam
2020-06-24 22:08:31 +02:00
parent 99d66ea89f 238df0fb40
commit a574fce13f
13 changed files with 250 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,7 @@ function importSingleFile(taskContext, file, parentNote) {
return importCodeNote(taskContext, file, parentNote);
}
if (["image/jpeg", "image/gif", "image/png", "image/webp"].includes(mime)) {
if (mime.startsWith("image/")) {
return importImage(file, parentNote, taskContext);
}