Skip to content
Commit 04ac7192 authored by Sergey Pepyakin's avatar Sergey Pepyakin
Browse files

Merge master 

# Conflicts:
#	node/cli/src/chain_spec.rs
#	node/runtime/src/lib.rs
#	srml/staking/src/lib.rs
#	srml/staking/src/mock.rs
#	srml/staking/src/tests.rs
parents b0150947 138bcf0d
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