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

Merge master 

# Conflicts:
#	bin/node/runtime/src/lib.rs
#	frame/contracts/src/gas.rs
#	frame/contracts/src/lib.rs
#	frame/contracts/src/tests.rs
parents 624b3efb 297e6495
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