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

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

parents 2be4f2f7 38ccc245
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