Skip to content
Commit 501f772f authored by Andrew Jones's avatar Andrew Jones
Browse files

Merge branch 'rococo-v1' into aj-cumulus

# Conflicts:
#	Cargo.lock
#	node/src/chain_spec.rs
#	node/src/service.rs
#	runtime/Cargo.toml
#	runtime/src/lib.rs
parents 08421e34 cc2c8ffb
Pipeline #149166 failed with stages
in 5 minutes and 40 seconds
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