Skip to content
Commit 27ee43ca authored by Nazar Mokrynskyi's avatar Nazar Mokrynskyi
Browse files

Merge remote-tracking branch 'upstream/master' into syncing-strategy-refactoring-part-3 

# Conflicts:
#	substrate/client/network/sync/src/strategy/chain_sync.rs
parents 87be088c aeebf2f3
Pipeline #502430 waiting for manual action with stages
in 24 minutes and 30 seconds