Daniel García f84cbeaaf8 Merge branch 'master' into rocket-0.4 ... # Conflicts: # src/db/models/organization.rs		2018-11-14 16:14:49 +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	Initial u2f fix	2018-11-09 00:00:31 -06: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-09 16:06:24 +01:00