diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-10-13 09:54:11 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-10-13 09:54:11 -0500 |
| commit | 4ead0d564fa60b1a908f6237474250d6bda85ae9 (patch) | |
| tree | 4a7852367e339f6759ccbabe70d6670e52cf171f /lib/pleroma/web/common_api/utils.ex | |
| parent | 8bacdc36806efd01a7897359ff0fd2c8e24730d2 (diff) | |
| parent | 8b6221d4ecd1d7e354e7de831dd46e285cb85077 (diff) | |
| download | pleroma-4ead0d564fa60b1a908f6237474250d6bda85ae9.tar.gz | |
Merge branch 'develop' into refactor/discoverable_user_field
Diffstat (limited to 'lib/pleroma/web/common_api/utils.ex')
| -rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 9d7b24eb2..21f4d43e9 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -12,12 +12,12 @@ defmodule Pleroma.Web.CommonAPI.Utils do alias Pleroma.Conversation.Participation alias Pleroma.Formatter alias Pleroma.Object - alias Pleroma.Plugs.AuthenticationPlug alias Pleroma.Repo alias Pleroma.User alias Pleroma.Web.ActivityPub.Utils alias Pleroma.Web.ActivityPub.Visibility alias Pleroma.Web.MediaProxy + alias Pleroma.Web.Plugs.AuthenticationPlug require Logger require Pleroma.Constants |