From: Dessalines <tyhou13@gmx.com>
Date: Sun, 3 May 2020 17:27:53 +0000 (-0400)
Subject: Merge branch 'federation' into federated_remove_actions
X-Git-Url: http://these/git/%24%7B%60data:application/static/%7B%60https:/%7B%60/feeds/%7BcanonicalUrl%7D?a=commitdiff_plain;h=dfc9637230907df73c50dddf5fd565159bb38ec5;p=lemmy.git

Merge branch 'federation' into federated_remove_actions
---

dfc9637230907df73c50dddf5fd565159bb38ec5
diff --cc server/src/apub/mod.rs
index 3c18a013,5b65411a..0438f92e
--- a/server/src/apub/mod.rs
+++ b/server/src/apub/mod.rs
@@@ -13,8 -13,8 +13,8 @@@ use crate::api::community::CommunityRes
  use crate::websocket::server::SendCommunityRoomMessage;
  use activitystreams::object::kind::{NoteType, PageType};
  use activitystreams::{
 -  activity::{Accept, Create, Delete, Dislike, Follow, Like, Undo, Update},
 +  activity::{Accept, Create, Delete, Dislike, Follow, Like, Remove, Undo, Update},
-   actor::{properties::ApActorProperties, Actor, Group, Person},
+   actor::{kind::GroupType, properties::ApActorProperties, Actor, Group, Person},
    collection::UnorderedCollection,
    context,
    endpoint::EndpointProperties,