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

Merge branch 'master' into genesis-code-spec 

# Conflicts:
#	srml/support/procedural/src/storage/genesis_config/genesis_config_def.rs
parents 61cd3f0f a73793b0
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