Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
d1eb1913
Commit
d1eb1913
authored
Apr 19, 2021
by
Sean King
Browse files
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/opt-out-of-google-floc
parents
2b4f958b
7183655a
Changes
1
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/web/common_api.ex
View file @
d1eb1913
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment