Substrate.from() (#431)

* Update branches

* Bump runtime.

* Update again.
This commit is contained in:
Gavin Wood
2019-09-13 15:27:41 +02:00
committed by Robert Habermeier
parent cccfdee49b
commit 99c6d600c4
15 changed files with 674 additions and 644 deletions
@@ -9,7 +9,7 @@ adder = { path = ".." }
parachain = { package = "polkadot-parachain", path = "../../../parachain" }
collator = { package = "polkadot-collator", path = "../../../collator" }
primitives = { package = "polkadot-primitives", path = "../../../primitives" }
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-testing" }
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
parking_lot = "0.9.0"
ctrlc = { version = "3.0", features = ["termination"] }
futures = "0.1"