Merge branch 'develop' into chore/elixir-1.11

diff --cc config/config.exs
Simple merge

diff --cc lib/phoenix/transports/web_socket/raw.ex
Simple merge

diff --cc lib/pleroma/application.ex
Simple merge

diff --cc lib/pleroma/web.ex
Simple merge

diff --cc lib/pleroma/web/activity_pub/activity_pub_controller.ex
Simple merge

diff --cc lib/pleroma/web/common_api/utils.ex
Simple merge

diff --cc lib/pleroma/web/mastodon_api/controllers/auth_controller.ex
Simple merge

diff --cc lib/pleroma/web/mastodon_api/controllers/status_controller.ex
Simple merge

diff --cc lib/pleroma/web/media_proxy/invalidation/http.ex
Simple merge