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

2021-04-19 15:42:38 -06:00 · 2021-04-19 15:42:38 -06:00 · d1eb1913e8
commit d1eb1913e8
parent 2b4f958b2a 7183655a07
1 changed files with 1 additions and 1 deletions
--- a/lib/pleroma/web/common_api.ex
+++ b/lib/pleroma/web/common_api.ex
@ -415,7 +415,7 @@ def pin(id, %User{} = user) do
           ) do
      {:ok, activity}
    else
-      {:error, {:execute_side_effects, error}} -> error
+      {:error, {:side_effects, error}} -> error
      error -> error
    end
  end