Skip to content
Commit 6403287a authored by Tomusdrw's avatar Tomusdrw
Browse files

Merge branch 'master' into fix_suicide 

Conflicts:
	src/externalities.rs
parents 382b22b9 10dd07f9
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