Merge remote-tracking branch 'origin/master'

This commit is contained in:
zadam 2019-12-03 20:32:01 +01:00
commit b0368c7f17

View File

@ -78,7 +78,7 @@ async function copyChildAttributes(parentNote, childNote) {
* - {string} parentNoteId * - {string} parentNoteId
* - {string} title * - {string} title
* - {*} content * - {*} content
* - {string} type - text, code, file, image, search, book, relation-map * - {string} type - text, code, file, image, search, book, relation-map, render
* *
* Following are optional (have defaults) * Following are optional (have defaults)
* - {string} mime - value is derived from default mimes for type * - {string} mime - value is derived from default mimes for type
@ -543,4 +543,4 @@ module.exports = {
protectNoteRecursively, protectNoteRecursively,
scanForLinks, scanForLinks,
duplicateNote duplicateNote
}; };