Skip to content

Commit

Permalink
Merge pull request openethereum#3616 from ethcore/stable-testing
Browse files Browse the repository at this point in the history
Backporting to stable
  • Loading branch information
gavofyork authored Nov 25, 2016
2 parents a50974e + 1c45c91 commit 88c3520
Show file tree
Hide file tree
Showing 10 changed files with 339 additions and 25 deletions.
26 changes: 13 additions & 13 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
description = "Ethcore client."
name = "parity"
version = "1.3.13"
version = "1.3.14"
license = "GPL-3.0"
authors = ["Ethcore <[email protected]>"]
build = "build.rs"
Expand Down
Loading

0 comments on commit 88c3520

Please sign in to comment.