# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	src/api/core/mod.rs

Update backup section of README.md

Fixes NFC Response for Mobile Yubikey OTP Login

Adds Yubikey OTP Support

Prevent accepted user from seeing ciphers until confirmed (fixes #196)

# Conflicts:
#	src/db/models/organization.rs

Bump vault version to 2.5.0 [wip]

# Conflicts:
#	src/api/core/mod.rs

Make U2F work with vault 2.4.0 changes

Fixed change in organizations header, now Request::get_param() are indexed by segment, not dynamic parameter.

Switch from resin to balenalib