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

Merge and fix conflicts 

# Conflicts:
#	Cargo.lock
#	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
#	srml/contract/Cargo.toml
parents 7c9c8a6f 8b679660
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