Merge branch 'develop' into feature/custom-runtime-modules

This commit is contained in:
Egor Kislitsyn 2019-12-16 22:34:21 +07:00
commit b9a87b1baa
No known key found for this signature in database
GPG key ID: 1B49CB15B71E7805
3 changed files with 29 additions and 24 deletions

View file

@ -70,6 +70,8 @@ config :pleroma, Pleroma.Captcha,
seconds_valid: 60,
method: Pleroma.Captcha.Native
config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch"
config :pleroma, :hackney_pools,
federation: [
max_connections: 50,