Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/opt-out-of-google-floc

This commit is contained in:
Sean King 2021-04-19 15:42:38 -06:00
commit d1eb1913e8

View file

@ -415,7 +415,7 @@ defmodule Pleroma.Web.CommonAPI do
) do ) do
{:ok, activity} {:ok, activity}
else else
{:error, {:execute_side_effects, error}} -> error {:error, {:side_effects, error}} -> error
error -> error error -> error
end end
end end