Skip to content
Snippets Groups Projects
Commit 3fa51f72 authored by Ivan Tashkinov's avatar Ivan Tashkinov
Browse files

Merge remote-tracking branch...

Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses

# Conflicts:
#	lib/pleroma/web/mastodon_api/views/account_view.ex
#	lib/pleroma/web/mastodon_api/views/status_view.ex
parents 98b96e45 aa783251
Branches bugfix/object-fetching-handle-mrf-reject
No related tags found
No related merge requests found
Showing
with 26 additions and 20 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment