Merge remote-tracking branch 'upstream/develop' into media-proxy

README.md

installation/pleroma.nginx

lib/mix/tasks/generate_config.ex

lib/mix/tasks/sample_config.eex

lib/mix/tasks/sample_psql.eex

lib/pleroma/activity.ex

lib/pleroma/formatter.ex

lib/pleroma/plugs/authentication_plug.ex

lib/pleroma/plugs/oauth_plug.ex

lib/pleroma/user.ex

lib/pleroma/web/activity_pub/utils.ex

lib/pleroma/web/common_api/common_api.ex

lib/pleroma/web/common_api/utils.ex

lib/pleroma/web/federator/federator.ex

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex

test/formatter_test.exs

test/plugs/authentication_plug_test.exs

test/user_test.exs

test/web/federator_test.exs