Merge branch 'develop' into chore/elixir-1.11

This commit is contained in:
Mark Felder 2020-10-13 09:54:53 -05:00
commit 64553ebae2
649 changed files with 1403 additions and 567 deletions

View file

@ -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