Merge branch 'master' into jmarthernandez-remove-karma-from-search

1 files changed, 10 insertions, 12 deletions

diff --git a/server/src/routes/federation.rs b/server/src/routes/federation.rs
index fe6e3365..ebab139a 100644
--- a/server/src/routes/federation.rs
+++ b/server/src/routes/federation.rs
@@ -1,17 +1,15 @@
-use crate::{
-  apub::{
-    comment::get_apub_comment,
-    community::*,
-    community_inbox::community_inbox,
-    post::get_apub_post,
-    shared_inbox::shared_inbox,
-    user::*,
-    user_inbox::user_inbox,
-    APUB_JSON_CONTENT_TYPE,
-  },
-  settings::Settings,
+use crate::apub::{
+  comment::get_apub_comment,
+  community::*,
+  community_inbox::community_inbox,
+  post::get_apub_post,
+  shared_inbox::shared_inbox,
+  user::*,
+  user_inbox::user_inbox,
+  APUB_JSON_CONTENT_TYPE,
 };
 use actix_web::*;
+use lemmy_utils::settings::Settings;
 
 pub fn config(cfg: &mut web::ServiceConfig) {
   if Settings::get().federation.enabled {