Merge branch 'stable' of github.com:paritytech/parity into stable

openethereum · Jan 23, 2018 · e3d32a4 · e3d32a4
2 parents 5e775f3 + 9c7359e
commit e3d32a4
Show file tree

Hide file tree

Showing 30 changed files with 684 additions and 722 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Parity Ethereum client"
 name = "parity"
-version = "1.8.6"
+version = "1.8.7"
 license = "GPL-3.0"
 authors = ["Parity Technologies <[email protected]>"]
 build = "build.rs"