Skip to content
Commit 8ce4b60e authored by Dmitry Kashitsyn's avatar Dmitry Kashitsyn
Browse files

Merge remote-tracking branch 'origin/master' into dk-blitz

# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	demo/runtime/wasm/target/wasm32-unknown-unknown/release/demo_runtime.compact.wasm
#	demo/runtime/wasm/target/wasm32-unknown-unknown/release/demo_runtime.wasm
#	polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm
#	polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm
#	polkadot/service/Cargo.toml
#	polkadot/service/src/lib.rs
#	substrate/codec/src/slicable.rs
#	substrate/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.compact.wasm
#	substrate/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.wasm
#	substrate/test-runtime/wasm/target/wasm32-unknown-unknown/release/substrate_test_runtime.compact.wasm
#	substrate/test-runtime/wasm/target/wasm32-unknown-unknown/release/substrate_test_runtime.wasm
parents 72751e50 d4649d2b
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