Skip to content
Commit baa39516 authored by Gav Wood's avatar Gav Wood
Browse files

Merge remote-tracking branch 'origin/gav-parathreads' into gav-parathreads 

# Conflicts:
#	runtime/src/parachains.rs
parents 5e2478ba 4fb52c82
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