diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-10-13 19:25:18 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-10-13 19:25:18 -0500 |
| commit | 7d8f610720abdadeff9238aa8a345a91e473e0fa (patch) | |
| tree | c8fa941b0e0c0c7dd84888c4ae61e030f728b504 /lib/pleroma/web/common_api/utils.ex | |
| parent | 5ec7d88b77360ed78f75be6b1f94895c3f602972 (diff) | |
| parent | 481906207e6d803e5c4d3e455c7b93119e392177 (diff) | |
| download | pleroma-7d8f610720abdadeff9238aa8a345a91e473e0fa.tar.gz | |
Merge remote-tracking branch 'upstream/develop' into aliases
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 |