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
..
attachment.rs	Updated bw_rs to Rocket version 0.4-rc1	2018-11-01 19:25:09 +01:00
cipher.rs	Merge branch 'master' into rocket-0.4	2018-11-19 19:52:43 +01:00
collection.rs	Updated bw_rs to Rocket version 0.4-rc1	2018-11-01 19:25:09 +01:00
device.rs	Device::save() should return QueryResult instead of bool	2018-10-14 16:17:37 +02:00
folder.rs	Updated bw_rs to Rocket version 0.4-rc1	2018-11-01 19:25:09 +01:00
mod.rs	Implement poor man's invitation via Organization invitation	2018-09-11 13:09:59 +01:00
organization.rs	Merge branch 'master' into rocket-0.4	2018-11-14 16:14:49 +01:00
two_factor.rs	Updated bw_rs to Rocket version 0.4-rc1	2018-11-01 19:25:09 +01:00
user.rs	Merge branch 'master' into rocket-0.4	2018-11-14 16:14:49 +01:00