Skip to content
Commit 9430a2d8 authored by Sergey Pepyakin's avatar Sergey Pepyakin
Browse files

Merge 'origin/master' into retreat-slashing 

# Conflicts:
#	node/runtime/src/lib.rs
#	srml/babe/src/lib.rs
parents bbc837b9 9cedbaa4
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