summaryrefslogtreecommitdiff
path: root/config/config.exs
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-07-28 20:30:10 +0000
committerkaniini <ariadne@dereferenced.org>2019-07-28 20:30:10 +0000
commit44bfff22a7ba49f7cc329b4fb209645d95834612 (patch)
tree0b8aea5b54edbd3525f5e3809fb28b6cb87077e8 /config/config.exs
parent0d05ec385587e7a5efd0e3a36f5c783d78b4eea2 (diff)
parent242f5c585ed797917ba8c61ceb5d266f4c670c90 (diff)
downloadpleroma-44bfff22a7ba49f7cc329b4fb209645d95834612.tar.gz
pleroma-44bfff22a7ba49f7cc329b4fb209645d95834612.zip
Merge branch 'confirmation-resend' into 'develop'
add account confirmation email resend in mastodon api See merge request pleroma/pleroma!1492
Diffstat (limited to 'config/config.exs')
-rw-r--r--config/config.exs3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs
index 569411866..17770640a 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -534,7 +534,8 @@ config :pleroma, :rate_limit,
relation_id_action: {60_000, 2},
statuses_actions: {10_000, 15},
status_id_action: {60_000, 3},
- password_reset: {1_800_000, 5}
+ password_reset: {1_800_000, 5},
+ account_confirmation_resend: {8_640_000, 5}
# Import environment specific config. This must remain at the bottom
# of this file so it overrides the configuration defined above.