Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Mon, 13 Apr 2020 06:16:51 +0000 (09:16 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Mon, 13 Apr 2020 06:16:51 +0000 (09:16 +0300)
commita21baf89d874823137cc49052cfe8da769ac0748
tree20ed514fe2b13beebf0221d844745252f7604c02
parentdc2637c18880160286f50505b1140a58fdfdf7d1
parent7ee35eb9a6a55ef610eb02a04a33f67e5921cff3
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
CHANGELOG.md
lib/pleroma/user_relationship.ex
lib/pleroma/web/admin_api/admin_api_controller.ex
lib/pleroma/web/mastodon_api/controllers/notification_controller.ex
lib/pleroma/web/mastodon_api/controllers/status_controller.ex
lib/pleroma/web/mastodon_api/views/account_view.ex
lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
test/web/mastodon_api/controllers/notification_controller_test.exs
test/web/mastodon_api/controllers/status_controller_test.exs