Merge branch 'master' into gav-demo

This commit is contained in:
Gav
2018-03-02 14:59:32 +01:00
22 changed files with 574 additions and 66 deletions
+1 -1
View File
@@ -13,7 +13,7 @@ substrate-runtime-io = { path = "../../../substrate/runtime-io", default-feature
substrate-runtime-support = { path = "../../../substrate/runtime-support", default-features = false }
substrate-primitives = { path = "../../../substrate/primitives", default-features = false }
demo-primitives = { path = "../../primitives", default-features = false }
integer-sqrt = "0.1.0"
integer-sqrt = { git = "https://github.com/paritytech/integer-sqrt-rs.git", branch = "master" }
[features]
default = []