Merge branch 'develop' into chore/elixir-1.11
authorMark Felder <feld@FreeBSD.org>
Tue, 13 Oct 2020 14:54:53 +0000 (09:54 -0500)
committerMark Felder <feld@FreeBSD.org>
Tue, 13 Oct 2020 14:54:53 +0000 (09:54 -0500)
commit64553ebae2f415b309df5f6b1c13b9972bc65aaa
tree7e9b70d0def2b93c9e1f867f834ccc4ee1a9f6fc
parented6511a086694fc163b488d807f17d246f80ad5b
parent8b6221d4ecd1d7e354e7de831dd46e285cb85077
Merge branch 'develop' into chore/elixir-1.11
config/config.exs
lib/phoenix/transports/web_socket/raw.ex
lib/pleroma/application.ex
lib/pleroma/web.ex
lib/pleroma/web/activity_pub/activity_pub_controller.ex
lib/pleroma/web/common_api/utils.ex
lib/pleroma/web/mastodon_api/controllers/auth_controller.ex
lib/pleroma/web/mastodon_api/controllers/status_controller.ex
lib/pleroma/web/media_proxy/invalidation/http.ex