Skip to content
Commit 26ff6af9 authored by NikVolf's avatar NikVolf
Browse files

Merge branch 'fix-geth-2' of github.com:ethcore/parity into fix-geth-2

parents dcdd42fe 0fb318e9
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