Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix'...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 2 Apr 2020 16:38:39 +0000 (19:38 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 2 Apr 2020 16:38:39 +0000 (19:38 +0300)
commit3fa51f72728255fbe287bb307ab38d563e5611b4
tree89da8c8cd8ef5db3c8be2a769cb6273b0bba27d7
parent98b96e45ababecb7554232787968f2f326f24e54
parentaa78325117c879ecb7ec76383c239078275adbd9
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
lib/pleroma/web/mastodon_api/views/account_view.ex
lib/pleroma/web/mastodon_api/views/notification_view.ex
lib/pleroma/web/mastodon_api/views/status_view.ex