Commit d1eb1913 authored by Sean King's avatar Sean King
Browse files

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

parents 2b4f958b 7183655a
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment