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

Merge master into ser-reuse-wasm 

# Conflicts:
#	Cargo.lock
#	core/utils/wasm-builder/src/wasm_project.rs
parents c7fcc4db d5dc301e
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