Skip to content
Commit fadd8cac authored by Jim Posen's avatar Jim Posen
Browse files

Merge branch 'master' into grandpa-authority-storage

# Conflicts:
#	core/finality-grandpa/src/finality_proof.rs
#	core/finality-grandpa/src/tests.rs
#	node/runtime/src/lib.rs
parents 0b52b64b a746d38d
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