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

Merge 'origin/master' into ser-contract-weights-2 

# Conflicts:
#	bin/node/runtime/src/lib.rs
parents dbd2d3e3 59b8b10b
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