Daniel García a01fee0b9f Merge branch 'ws' ... # Conflicts: # Cargo.toml # src/api/core/ciphers.rs # src/main.rs		2018-09-13 15:59:45 +02:00
..
api	Merge branch 'ws'	2018-09-13 15:59:45 +02:00
db	Merge branch 'ws'	2018-09-13 15:59:45 +02:00
auth.rs	Add confirmed check to the OrgHeaders request guard	2018-07-16 10:23:45 +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	Special messages when user has no password hint	2018-09-11 13:04:34 +02:00
main.rs	Merge branch 'ws'	2018-09-13 15:59:45 +02:00
util.rs	Update theerror format to show message in new Vault	2018-08-15 15:50:07 +01:00