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
..
models	Merge branch 'master' into rocket-0.4	2018-11-19 19:52:43 +01:00
mod.rs	r2d2_diesel is included in diesel since 1.1, so we don't need the dependencies directly.	2018-03-07 18:41:34 +01:00
schema.rs	Implement KDF iterations change (Fixes #195)	2018-09-19 17:30:14 +02:00