self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-07-16 00:14:34 +02:00
Code Issues Releases Activity

Doc: Refactored documentation, split it into smaller articles, and added search (#9132)

Browse Source
This commit is contained in:
Laurent Cozic
2023-10-30 11:32:14 +00:00
committed by GitHub
parent f94cc0fe3c
commit 5f6370d7ba
237 changed files with 11124 additions and 3131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/lib/models/Resource.ts
View File

@ -444,7 +444,7 @@ export default class Resource extends BaseItem {
await Note.save({
title: _('Attachment conflict: "%s"', resource.title),
body: _('There was a [conflict](%s) on the attachment below.\n\n%s', 'https://joplinapp.org/conflict/', Resource.markdownTag(conflictResource)),
body: _('There was a [conflict](%s) on the attachment below.\n\n%s', 'https://joplinapp.org/help/apps/conflict', Resource.markdownTag(conflictResource)),
parent_id: await this.resourceConflictFolderId(),
}, { changeSource: ItemChange.SOURCE_SYNC });
}