Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

lib/pleroma/formatter.ex

lib/pleroma/web/endpoint.ex

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex

lib/pleroma/web/router.ex

...pleroma/web/templates/twitter_api/util/subscribe.html.eex

lib/pleroma/web/twitter_api/controllers/util_controller.ex

lib/pleroma/web/twitter_api/views/user_view.ex

lib/pleroma/web/web_finger/web_finger.ex

priv/static/instance/thumbnail.jpeg

test/web/ostatus/ostatus_test.exs

test/web/twitter_api/views/user_view_test.exs