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

Merge master into ser-reuse-wasm 

# Conflicts:
#	Cargo.lock
#	core/executor/Cargo.toml
#	core/test-runtime/wasm/build.sh
parents 565be748 47b09bc0
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