commit 9ecb29883cd7263305c0668ebc8a2c47e96faec8
parent e5af230315292e1159e5f07e9036245bc4b66a0d
Author: Daniel GarcĂa <dani-garcia@users.noreply.github.com>
Date: Mon, 19 Nov 2018 20:59:41 +0100
Merge branch 'master' into rocket-0.4
# Conflicts:
# Cargo.lock
Diffstat:
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Cargo.lock b/Cargo.lock
@@ -2483,7 +2483,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "yubico"
version = "0.4.0"
-source = "git+https://github.com/dani-garcia/yubico-rs#f93a88834e4ebaaed0169850ff1a5e32a7d01719"
+source = "git+https://github.com/dani-garcia/yubico-rs#a3a8143611f651d1ff6ec9a2d12599d0aaaea0c6"
dependencies = [
"base64 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",