Merge branch 'develop' into feature/configurable-blocks

CONFIGURATION.md

config/config.exs

installation/pleroma.nginx

lib/mix/tasks/make_moderator.ex

lib/mix/tasks/sample_config.eex

lib/mix/tasks/set_locked.ex

lib/pleroma/list.ex

lib/pleroma/upload.ex

lib/pleroma/user.ex

lib/pleroma/web/activity_pub/activity_pub.ex

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

lib/pleroma/web/activity_pub/transmogrifier.ex

lib/pleroma/web/activity_pub/utils.ex

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex

lib/pleroma/web/mastodon_api/mastodon_socket.ex

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

lib/pleroma/web/oauth/oauth_controller.ex

lib/pleroma/web/router.ex

lib/pleroma/web/streamer.ex

lib/pleroma/web/twitter_api/twitter_api.ex