Skip to content
Commit d8ac9e79 authored by Jimmy Chu's avatar Jimmy Chu
Browse files

Merge branch 'master' into jimmy/instant-seal-heartbeat 



Signed-off-by: default avatarJimmy Chu <[email protected]>

# Conflicts:
#	client/consensus/manual-seal/Cargo.toml
parents 88fba759 65cc9af9
Expand all Hide whitespace changes
Inline Side-by-side
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