Skip to content
Snippets Groups Projects
Commit a2c658ab authored by Jono Wenger's avatar Jono Wenger
Browse files

Merge remote-tracking branch 'origin/release' into XX-4382/databaseInWorker2 

# Conflicts:
#	indexedDb/impl/channels/implementation.go
#	indexedDb/impl/channels/implementation_test.go
#	indexedDb/impl/channels/init.go
#	indexedDb/impl/dm/implementation.go
#	indexedDb/impl/dm/init.go
#	wasm/channels.go
parents b5a3d7fa a0a0de3c
No related branches found
No related tags found
2 merge requests!67fix for latest client release,!52XX-4382 / Move indexedDb databases to web workers
Hide whitespace changes
Inline Side-by-side
Showing
with 355 additions and 117 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment