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

Merge 'origin/master' into ser-topic-events 

# Conflicts:
#	core/test-runtime/wasm/Cargo.lock
#	node-template/runtime/wasm/Cargo.lock
#	node/executor/src/lib.rs
#	node/runtime/src/lib.rs
#	node/runtime/wasm/Cargo.lock
parents 24b944f8 6e67eff0
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