diff options
author | Alex Gleason <alex@alexgleason.me> | 2020-10-13 19:22:32 -0500 |
---|---|---|
committer | Alex Gleason <alex@alexgleason.me> | 2020-10-13 19:22:32 -0500 |
commit | b3d6cf90229ff3e9a5bd0028d4a6cbd3b68da9fe (patch) | |
tree | 09f6b8bafcfb784c581800887d80a22d0461af0b /lib/pleroma/web/common_api/utils.ex | |
parent | 5c8d2c468c3a14cde029e7aeedd0cdb580cce1df (diff) | |
parent | 481906207e6d803e5c4d3e455c7b93119e392177 (diff) | |
download | pleroma-b3d6cf90229ff3e9a5bd0028d4a6cbd3b68da9fe.tar.gz |
Merge remote-tracking branch 'upstream/develop' into block-behavior
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 |