1
0
Fork 1
Spiegel von https://github.com/dani-garcia/vaultwarden.git synchronisiert 2024-11-22 05:10:29 +01:00

Merge branch 'master' into rocket-0.4

# Conflicts:
#	Cargo.toml
Dieser Commit ist enthalten in:
Daniel García 2018-11-19 20:45:42 +01:00
Commit e5af230315
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: FC8A7D14C3CD543A

Datei anzeigen

@ -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 }