Merge develop

config/config.md

config/test.exs

lib/mix/tasks/pleroma/sample_config.eex

lib/pleroma/application.ex

lib/pleroma/formatter.ex

lib/pleroma/html.ex

lib/pleroma/http/connection.ex

lib/pleroma/notification.ex

lib/pleroma/object.ex

lib/pleroma/plugs/oauth_plug.ex

lib/pleroma/reverse_proxy.ex

lib/pleroma/user.ex

lib/pleroma/user/info.ex

lib/pleroma/web/activity_pub/activity_pub.ex

lib/pleroma/web/activity_pub/mrf/ensure_re_prepended.ex

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

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex

lib/pleroma/web/mastodon_api/views/push_subscription_view.ex

lib/pleroma/web/ostatus/ostatus.ex

lib/pleroma/web/push/push.ex