Skip to content
GitLab
Explore
Sign in
Commit
9ca938f7
authored
Sep 30, 2016
by
keorn
Browse files
Merge remote-tracking branch 'parity/master' into bft
Conflicts: ethcore/src/client/client.rs sync/src/api.rs
parents
8a51ae02
443eb197
Changes
98
Hide whitespace changes
Inline
Side-by-side
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment