Skip to content
  • Ivan Tashkinov's avatar
    Merge remote-tracking branch... · 3fa51f72
    Ivan Tashkinov authored
    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
    3fa51f72