Merge branch 'master' into rh-candidate-agreement

This commit is contained in:
Robert Habermeier
2017-12-14 11:54:25 +01:00
6 changed files with 268 additions and 1 deletions
+8
View File
@@ -643,6 +643,14 @@ dependencies = [
"polkadot-state-machine 0.1.0",
]
[[package]]
name = "polkadot-collator"
version = "0.1.0"
dependencies = [
"futures 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
"polkadot-primitives 0.1.0",
]
[[package]]
name = "polkadot-contracts"
version = "0.1.0"