Merge branch 'master' into rocket-0.4

# Conflicts:
#	Cargo.toml
This commit is contained in:
Daniel García 2018-11-19 20:45:42 +01:00
commit e5af230315
No known key found for this signature in database
GPG key ID: FC8A7D14C3CD543A

View file

@ -57,7 +57,7 @@ jsonwebtoken = "5.0.1"
u2f = "0.1.2" u2f = "0.1.2"
# Yubico Library # Yubico Library
yubico = { version = "=0.4.0", default-features = false } yubico = { version = "=0.4.0", features = ["online"], default-features = false }
# A `dotenv` implementation for Rust # A `dotenv` implementation for Rust
dotenv = { version = "0.13.0", default-features = false } dotenv = { version = "0.13.0", default-features = false }