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

Merge 'origin/master' into ser-reuse-wasm 

# Conflicts:
#	core/executor/src/allocator.rs
#	core/test-runtime/client/src/lib.rs
#	node/runtime/src/lib.rs
parents 4bb7bcfe f9e5a374
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