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

Merge and fix conflicts 

# Conflicts:
#	srml/contract/src/exec.rs
#	srml/contract/src/tests.rs
#	srml/contract/src/wasm/mod.rs
#	srml/contract/src/wasm/runtime.rs
parents cb20aef5 f6081588
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