Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11

This commit is contained in:
Ivan Tashkinov 2020-10-17 17:53:47 +03:00
commit 9ea31b373f
85 changed files with 393 additions and 314 deletions

View file

@ -801,6 +801,8 @@ config :pleroma, :hackney_pools,
timeout: 300_000
]
config :pleroma, :majic_pool, size: 2
private_instance? = :if_instance_is_private
config :pleroma, :restrict_unauthenticated,