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
+1 -1
View File
@@ -10,7 +10,7 @@ codec = { package = "parity-scale-codec", version = "1.0.5", default-features =
wasmi = { version = "0.4.3", optional = true }
derive_more = { version = "0.14", optional = true }
serde = { version = "1.0", default-features = false, features = [ "derive" ] }
rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate", branch = "polkadot-testing", default-features = false }
rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
lazy_static = { version = "1.3.0", optional = true }
parking_lot = { version = "0.7.1", optional = true }
log = { version = "0.4.6", optional = true }