Merge remote-tracking branch 'origin/stable'

# Conflicts:
#	src/services/sync_table.js
This commit is contained in:
zadam
2020-03-14 12:58:47 +01:00
2 changed files with 7 additions and 7 deletions

View File

@@ -211,6 +211,8 @@ async function transactional(func) {
transactionActive = false;
resolve();
setTimeout(() => require('./ws').sendPingToAllClients(), 50);
}
catch (e) {
if (transactionActive) {