Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 02:16:05 +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

1
src/services/export/zip.js
View File

@@ -3,7 +3,6 @@
const html = require('html');
const repository = require('../repository');
const dateUtils = require('../date_utils');
const zip = require('tar-stream');
const path = require('path');
const mimeTypes = require('mime-types');
const mdService = require('./md');