aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2018-12-20 13:28:36 +0000
committerkaniini <nenolod@gmail.com>2018-12-20 13:28:36 +0000
commit2e2030ada8b9aa00936057d47260cd03d01d92be (patch)
tree9fb353e3eaccb1dbd82738cf44ae5015100f6711 /docs
parent8de3138de07c0447ea3bc015ff71db25f8f9c931 (diff)
parent851db74f1ca533f27f72f1341571948b15d2f561 (diff)
downloadpleroma-2e2030ada8b9aa00936057d47260cd03d01d92be.tar.gz
Merge branch '114_email_confirmation' into 'develop'
[#114] Email confirmation See merge request pleroma/pleroma!546
Diffstat (limited to 'docs')
-rw-r--r--docs/config.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/config.md b/docs/config.md
index 63c895753..c35769f21 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -69,6 +69,7 @@ config :pleroma, Pleroma.Mailer,
* `banner_upload_limit`: File size limit of user’s profile banners
* `registrations_open`: Enable registrations for anyone, invitations can be enabled when false.
* `invites_enabled`: Enable user invitations for admins (depends on `registrations_open: false`).
+* `account_activation_required`: Require users to confirm their emails before signing in.
* `federating`: Enable federation with other instances
* `allow_relay`: Enable Pleroma’s Relay, which makes it possible to follow a whole instance
* `rewrite_policy`: Message Rewrite Policy, either one or a list. Here are the ones available by default: