Skip to content
Commit 3da142f5 authored by Spencer Judge's avatar Spencer Judge
Browse files

Merge branch 'master' into expose-current-extrinsic-data 

# Conflicts:
#	bin/node/runtime/src/lib.rs
parents 585b7fed 1c15f4f6
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