Merge branch 'stable'

# Conflicts:
#	src/services/notes.js
This commit is contained in:
zadam
2020-01-07 22:29:54 +01:00
6 changed files with 47 additions and 47 deletions

View File

@@ -594,6 +594,8 @@ async function eraseDeletedNotes() {
SET name = 'deleted',
value = ''
WHERE noteId IN (???)`, noteIdsToErase);
log.info(`Erased notes: ${JSON.stringify(noteIdsToErase)}`);
}
async function duplicateNote(noteId, parentNoteId) {