Merge branch 'master' into shuffling

This commit is contained in:
Age Manning
2018-10-10 14:41:49 +11:00
17 changed files with 265 additions and 886 deletions

View File

@@ -12,7 +12,6 @@ clap = "2.32.0"
db = { path = "lighthouse/db" }
dirs = "1.0.3"
futures = "0.1.23"
network-libp2p = { path = "network-libp2p" }
rand = "0.3"
rlp = { git = "https://github.com/paritytech/parity-common" }
slog = "^2.2.3"