Skip to content
Commit 577c215f authored by Jon Häggblad's avatar Jon Häggblad
Browse files

Merge branch 'master' into jon/make-secondary-slot-randomness-available 

 Conflicts:
	bin/node/runtime/src/lib.rs
parents 8c7f07df eb667452
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