Skip to content
Commit 9849ce08 authored by Tomusdrw's avatar Tomusdrw
Browse files

Merge branch 'master' into evm 

Conflicts:
	src/evm/tests.rs
	src/executive.rs
	src/externalities.rs
	src/tests/executive.rs
parents 3979b787 7a6ace66
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