diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-10-15 16:39:01 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-10-15 16:39:01 -0500 |
| commit | fb056ce05b43841ce57135ffb0b25845c41639ef (patch) | |
| tree | edd3e47128b454ab721027b5c6f30d0bcc5bd27c /config/config.exs | |
| parent | 724e4b7f00041667b9fa61fd1b7dd51c8eeaa102 (diff) | |
| parent | 5703fb6d2a5f9fcffe050eadbc43758bcd2efa14 (diff) | |
| download | pleroma-fb056ce05b43841ce57135ffb0b25845c41639ef.tar.gz pleroma-fb056ce05b43841ce57135ffb0b25845c41639ef.zip | |
Merge branch 'develop' into refactor/discoverable_user_field
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 273da5bb6..2c6142360 100644 --- a/config/config.exs +++ b/config/config.exs @@ -802,6 +802,8 @@ config :pleroma, :hackney_pools, timeout: 300_000 ] +config :pleroma, :majic_pool, size: 2 + private_instance? = :if_instance_is_private config :pleroma, :restrict_unauthenticated, |