Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/opt-out-of-google-floc
This commit is contained in:
commit
d1eb1913e8
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user