]> Untitled Git - lemmy.git/commitdiff
Merge branch 'main' into split_user_table
authorDessalines <tyhou13@gmx.com>
Thu, 18 Mar 2021 20:30:29 +0000 (16:30 -0400)
committerDessalines <tyhou13@gmx.com>
Thu, 18 Mar 2021 20:30:29 +0000 (16:30 -0400)
1  2 
crates/apub/src/activities/send/community.rs
docker/dev/docker-compose.yml
docker/federation/docker-compose.yml
docker/prod/docker-compose.yml

index 9cef95b60a95a02bfca357ea1940b29b45ae0f85,185f4b57fe98379554d0c0d73cdb6177c4ca3bc9..af77a47357a0bfa660aeca2e86f7f02d8c18f5c5
@@@ -3,7 -3,8 +3,8 @@@ use crate::
    activity_queue::{send_activity_single_dest, send_to_community_followers},
    check_is_apub_id_valid,
    extensions::context::lemmy_context,
 -  fetcher::user::get_or_fetch_and_upsert_user,
 +  fetcher::person::get_or_fetch_and_upsert_person,
+   insert_activity,
    ActorType,
  };
  use activitystreams::{
Simple merge
Simple merge
Simple merge