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
..
api	Merge branch 'master' into rocket-0.4	2018-11-14 16:14:49 +01:00
db	Merge branch 'master' into rocket-0.4	2018-11-14 16:14:49 +01:00
auth.rs	Merge branch 'master' into rocket-0.4	2018-11-14 16:14:49 +01:00
crypto.rs	Fixed cipher import, created missing data structs instead of using generic Value, and fixed some warnings	2018-02-23 00:38:54 +01:00
mail.rs	Updated dependencies, removed valid mail check (now done by lettre), and updated global domains file	2018-10-04 00:01:04 +02:00
main.rs	Updated bw_rs to Rocket version 0.4-rc1	2018-11-01 19:25:09 +01:00
util.rs	Updated bw_rs to Rocket version 0.4-rc1	2018-11-01 19:25:09 +01:00