commit: d1eb1913e86a79abdff5bcfc27d46dcc1c352d3e
parent 2b4f958b2ad653ee8e294ade18aa4482e4d372e1
Author: Sean King <seanking2919@protonmail.com>
Date: Mon, 19 Apr 2021 15:42:38 -0600
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/opt-out-of-google-floc
Diffstat:
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/pleroma/web/common_api.ex b/lib/pleroma/web/common_api.ex
@@ -415,7 +415,7 @@ defmodule Pleroma.Web.CommonAPI do
) do
{:ok, activity}
else
- {:error, {:execute_side_effects, error}} -> error
+ {:error, {:side_effects, error}} -> error
error -> error
end
end