mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 10:26:08 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/stable'
# Conflicts: # src/services/sync_table.js
This commit is contained in:
		| @@ -211,6 +211,8 @@ async function transactional(func) { | ||||
|  | ||||
|             transactionActive = false; | ||||
|             resolve(); | ||||
|  | ||||
|             setTimeout(() => require('./ws').sendPingToAllClients(), 50); | ||||
|         } | ||||
|         catch (e) { | ||||
|             if (transactionActive) { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user