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

Merge remote-tracking branch 'origin/master' into ser-contract-dispatch 

# Conflicts:
#	core/test-runtime/wasm/target/wasm32-unknown-unknown/release/substrate_test_runtime.compact.wasm
#	node/runtime/wasm/target/wasm32-unknown-unknown/release/node_runtime.compact.wasm
parents 2dfba631 7a155388
Expand all 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