Merge remote-tracking branch 'origin/master' into fmt

This commit is contained in:
Jake Howard committed 2021-04-06 21:55:28 +01:00
commit 994669fb69
25 files changed
+326 -147

No files matched your search

+2 -1
View File
@@ -10,8 +10,9 @@ use serde_json::Value;
pub use crate::api::{
admin::routes as admin_routes,
core::purge_sends,
core::purge_trashed_ciphers,
core::routes as core_routes,
core::start_send_deletion_scheduler,
icons::routes as icons_routes,
identity::routes as identity_routes,
notifications::routes as notifications_routes,