summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean King <seanking2919@protonmail.com>2021-04-19 15:42:38 -0600
committerSean King <seanking2919@protonmail.com>2021-04-19 15:42:38 -0600
commitd1eb1913e86a79abdff5bcfc27d46dcc1c352d3e (patch)
tree0e80586df2ba66f5bd3d75c125c85bdfaa27987c
parent2b4f958b2ad653ee8e294ade18aa4482e4d372e1 (diff)
parent7183655a072375603de46dea341c21b099deed7a (diff)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/opt-out-of-google-floc
-rw-r--r--lib/pleroma/web/common_api.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api.ex b/lib/pleroma/web/common_api.ex
index 3970c19a8..1b5f8491e 100644
--- 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