Merge branch 'master' into pv63-receipts

Conflicts:
	ethcore/src/client/client.rs
This commit is contained in:
Nikolay Volf
2016-03-14 17:36:51 +01:00
25 changed files with 109 additions and 92 deletions

View File

@@ -1,7 +1,7 @@
[package]
description = "Ethcore blockchain sync"
name = "ethsync"
version = "0.9.99"
version = "1.1.0"
license = "GPL-3.0"
authors = ["Ethcore <admin@ethcore.io"]