self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-15 23:00:36 +02:00
Code Issues Releases Activity

Merge branch 'master' into webdav

Browse Source
This commit is contained in:
Laurent Cozic
2018-01-24 17:25:34 +00:00
parent 5393a1399c fd29f20b2e
commit 6ade09c228
11 changed files with 163 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReactNativeClient/lib/synchronizer.js
View File

@ -489,7 +489,7 @@ class Synchronizer {
if (action == 'createLocal' || action == 'updateLocal') {
if (content === null) {
this.logger().warn('Remote has been deleted between now and the list() call? In that case it will be handled during the next sync: ' + path);
this.logger().warn('Remote has been deleted between now and the delta() call? In that case it will be handled during the next sync: ' + path);
continue;
}
content = ItemClass.filter(content);