Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
authorIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 13 May 2020 09:42:36 +0000 (12:42 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 13 May 2020 09:42:36 +0000 (12:42 +0300)
commitfd2fb2bb2e2292997fbe6f70c4d12b50c56cfab9
tree12f2ac82ed24394fb52b5d0664583dc668814421
parentbfb48e3db6009c31e52cfe5ac4828a6143d7e549
parent156c8a508846bd6d4e55f666c4ecc6f0129ac5fc
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding

# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/status_controller.ex
# lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
# test/web/mastodon_api/controllers/timeline_controller_test.exs
# test/web/mastodon_api/views/status_view_test.exs
lib/pleroma/web/admin_api/admin_api_controller.ex
lib/pleroma/web/mastodon_api/controllers/status_controller.ex
lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
lib/pleroma/web/mastodon_api/views/account_view.ex
test/web/mastodon_api/controllers/notification_controller_test.exs
test/web/mastodon_api/controllers/status_controller_test.exs
test/web/mastodon_api/controllers/timeline_controller_test.exs
test/web/mastodon_api/views/account_view_test.exs
test/web/mastodon_api/views/notification_view_test.exs
test/web/mastodon_api/views/status_view_test.exs