Merge remote-tracking branch 'origin/stable' into next

# Conflicts:
#	package-lock.json
#	package.json
This commit is contained in:
zadam
2021-05-15 22:45:11 +02:00
7 changed files with 32 additions and 28 deletions

View File

@@ -111,8 +111,6 @@ function forceNoteSync(req) {
entityChangesService.moveEntityChangeToTop('note_revision_contents', noteRevisionId);
}
entityChangesService.moveEntityChangeToTop('recent_changes', noteId);
log.info("Forcing note sync for " + noteId);
// not awaiting for the job to finish (will probably take a long time)