Merged develop onto 0.14 (which was tricky, and this might have introduced bugs?).
This commit is contained in:
parent
c69e944033
commit
53fb890a7e
21 changed files with 425 additions and 367 deletions
|
@ -33,18 +33,18 @@ encoding = "0.2"
|
|||
failure = "0.1"
|
||||
futures = "0.1"
|
||||
irc-proto = { version = "*", path = "irc-proto" }
|
||||
log = "0.3"
|
||||
native-tls = "0.1"
|
||||
log = "0.4"
|
||||
native-tls = "0.2"
|
||||
serde = "1.0"
|
||||
serde_derive = "1.0"
|
||||
serde_json = { version = "1.0", optional = true }
|
||||
serde_yaml = { version = "0.7", optional = true }
|
||||
tokio = "0.1"
|
||||
tokio-codec = "0.1"
|
||||
tokio-core = "0.1"
|
||||
tokio-io = "0.1"
|
||||
tokio-mockstream = "1.1"
|
||||
tokio-timer = "0.1"
|
||||
tokio-tls = "0.1"
|
||||
tokio-tls = "0.2"
|
||||
toml = { version = "0.4", optional = true }
|
||||
|
||||
[dev-dependencies]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue