Skip to content
Commit 93aa6c61 authored by Nikolay Volf's avatar Nikolay Volf
Browse files

Merge branch 'master' into path-man 

Conflicts:
	parity/configuration.rs
parents 96496d63 354ac7d6
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