Skip to content
Commit aaf26d27 authored by Sergei Shulepov's avatar Sergei Shulepov
Browse files

Merge remote-tracking branch 'origin/master' into ser-wasmtime-api 

# Conflicts:
#	Cargo.lock
#	client/executor/common/src/sandbox.rs
#	client/executor/wasmi/src/lib.rs
#	client/executor/wasmtime/src/function_executor.rs
#	client/executor/wasmtime/src/runtime.rs
#	client/executor/wasmtime/src/util.rs
parents 50c88e0c 657484a4
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