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

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

parents 7136cd70 57e9ed3f
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