Merge branch 'master' into rocket-0.4

# Conflicts: # Cargo.toml
2018-11-19 20:45:42 +01:00 · 2018-11-19 20:45:42 +01:00 · e5af230315
Commit e5af230315
--- a/Cargo.toml
+++ b/Cargo.toml
@ -57,7 +57,7 @@ jsonwebtoken = "5.0.1"
 u2f = "0.1.2"

 # 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
 dotenv = { version = "0.13.0", default-features = false }