Skip to content
Commit 2b81cc2b authored by Sergey Pepyakin's avatar Sergey Pepyakin
Browse files

Merge 'origin/master' into retreat-slashing

# Conflicts:
#	node/cli/src/chain_spec.rs
#	node/runtime/src/lib.rs
#	srml/im-online/src/lib.rs
parents 53b2c644 a6223615
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