Skip to content
Commit f32e7ce8 authored by fewensa's avatar fewensa
Browse files

Merge branch 'master' of https://github.com/paritytech/parity-bridges-common...

Merge branch 'master' of https://github.com/paritytech/parity-bridges-common into feature/issue-parity-895

 Conflicts:
	bin/millau/runtime/src/rialto_messages.rs
	bin/rialto/runtime/src/millau_messages.rs
parents 12d50a40 9ac07e73
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