Skip to content
Commit ad268d27 authored by Marek Kotewicz's avatar Marek Kotewicz
Browse files

Merge branch 'master' of github.com:ethcore/parity into jsonrpc2

parents 52ed69b6 769e776e
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