diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-01-10 16:18:32 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-01-10 16:18:32 +0300 |
| commit | 39ce894a07cc546092e9c3fcdedabd2b750524c0 (patch) | |
| tree | cf36180e1effe3c90a40174e9510ab5cbffdba3f /config | |
| parent | 6c94b7498b889ffe13691123c94bbe5440786852 (diff) | |
| parent | 05ca420c0994b079116b40ea5a84214b50d56d0e (diff) | |
| download | pleroma-39ce894a07cc546092e9c3fcdedabd2b750524c0.tar.gz pleroma-39ce894a07cc546092e9c3fcdedabd2b750524c0.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
# Conflicts:
# lib/pleroma/user.ex
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index eeb88174a..e2901cf12 100644 --- a/config/config.exs +++ b/config/config.exs @@ -67,7 +67,7 @@ config :pleroma, Pleroma.Scheduler, config :pleroma, Pleroma.Captcha, enabled: true, - seconds_valid: 3000, + seconds_valid: 300, method: Pleroma.Captcha.Native config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch" |