Merge branch 'master' into ws-rs

This commit is contained in:
Tomasz Drwięga
2016-08-08 21:24:52 +02:00
41 changed files with 839 additions and 545 deletions

View File

@@ -12,7 +12,7 @@ rustc_version = "0.1"
[dependencies]
rand = "0.3.14"
jsonrpc-core = "2.0"
jsonrpc-core = "2.1"
log = "0.3"
env_logger = "0.3"
ws = { git = "https://github.com/ethcore/ws-rs.git", branch = "mio-upstream-stable" }