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 resource_cleanup

Browse Source
This commit is contained in:
Laurent Cozic
2018-03-15 18:19:06 +00:00
parent c9e130a771 2599c425c3
commit df7b981e5e
36 changed files with 291 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ReactNativeClient/lib/BaseModel.js
View File

@ -1,4 +1,3 @@
const { Log } = require('lib/log.js');
const { Database } = require('lib/database.js');
const { uuid } = require('lib/uuid.js');
const { time } = require('lib/time-utils.js');
@ -400,7 +399,7 @@ class BaseModel {
output = this.filter(o);
} catch (error) {
Log.error('Cannot save model', error);
this.logger().error('Cannot save model', error);
}
this.releaseSaveMutex(o, mutexRelease);