From: lain <lain@soykaf.club>
Date: Sat, 30 May 2020 10:31:12 +0000 (+0200)
Subject: Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=6ff079ca9f1869ecc0789f8d684e8ea2959ccf1e;p=akkoma

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
---

6ff079ca9f1869ecc0789f8d684e8ea2959ccf1e
diff --cc lib/pleroma/web/activity_pub/builder.ex
index a40054921,51b74414a..1aac62c69
--- a/lib/pleroma/web/activity_pub/builder.ex
+++ b/lib/pleroma/web/activity_pub/builder.ex
@@@ -5,9 -5,9 +5,10 @@@ defmodule Pleroma.Web.ActivityPub.Build
    This module encodes our addressing policies and general shape of our objects.
    """
  
 +  alias Pleroma.Emoji
    alias Pleroma.Object
    alias Pleroma.User
+   alias Pleroma.Web.ActivityPub.Relay
    alias Pleroma.Web.ActivityPub.Utils
    alias Pleroma.Web.ActivityPub.Visibility