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

Merge branch 'master' into aj-error-chain 

# Conflicts:
#	validation/src/collation.rs
parents 3ec570f8 89a7d8dc
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