Olivier Martin 2421d49d9a Merge branch 'master' of github.com:dani-garcia/bitwarden_rs into 2fa_enforcement ... # Conflicts: # src/db/models/org_policy.rs # src/db/models/organization.rs		2021-04-16 14:29:28 -04:00
..
authenticator.rs	Modify rustfmt file	2021-04-06 21:54:42 +01:00
duo.rs	Format the changes from merge to master	2021-04-15 18:30:23 +02:00
email.rs	Modify rustfmt file	2021-04-06 21:54:42 +01:00
mod.rs	Merge branch 'master' of github.com:dani-garcia/bitwarden_rs into 2fa_enforcement	2021-04-16 14:29:28 -04:00
u2f.rs	Modify rustfmt file	2021-04-06 21:54:42 +01:00
yubikey.rs	Removed try_trait and some formatting, particularly around imports	2020-07-14 18:34:22 +02:00