Merge branch 'master' into author-relay-block

This commit is contained in:
Robert Habermeier
2018-01-31 18:10:53 +01:00
58 changed files with 3509 additions and 561 deletions
+2
View File
@@ -6,6 +6,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
error-chain = "0.11"
polkadot-cli = { path = "cli", version = "0.1" }
polkadot-network = { path = "network" }
[workspace]
members = [
@@ -15,6 +16,7 @@ members = [
"environmental",
"executor",
"native-runtime",
"network",
"primitives",
"rpc-servers",
"rpc",