Daniel García 5edbd0e952

Merge branch 'master' into rocket-0.4 ...

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

2018-11-19 19:52:43 +01:00

..

accounts.rs

Updated bw_rs to Rocket version 0.4-rc1

2018-11-01 19:25:09 +01:00

ciphers.rs

Merge branch 'master' into rocket-0.4

2018-11-14 16:14:49 +01:00

folders.rs

Updated bw_rs to Rocket version 0.4-rc1

2018-11-01 19:25:09 +01:00

global_domains.json

Updated dependencies, removed valid mail check (now done by lettre), and updated global domains file

2018-10-04 00:01:04 +02:00

mod.rs

Adds Yubikey OTP Support

2018-11-15 18:43:09 -07:00

organizations.rs

Merge branch 'master' into rocket-0.4

2018-11-14 16:14:49 +01:00

two_factor.rs

Merge branch 'master' into rocket-0.4

2018-11-19 19:52:43 +01:00