Merge branch 'develop' into kaniini/pleroma-feature/activitypub-endpoints

lib/pleroma/web/oauth/authorization.ex

lib/pleroma/web/router.ex

lib/pleroma/web/web_finger/web_finger.ex

lib/pleroma/web/web_finger/web_finger_controller.ex

test/fixtures/httpoison_mock/framasoft@framatube.org.json

test/support/conn_case.ex

test/support/data_case.ex

test/support/httpoison_mock.ex

test/web/mastodon_api/status_view_test.exs

test/web/web_finger/web_finger_test.exs