diff options
| author | href <href+git-pleroma@random.sh> | 2018-12-14 20:22:24 +0000 |
|---|---|---|
| committer | href <href+git-pleroma@random.sh> | 2018-12-14 20:22:24 +0000 |
| commit | bfe27c1b557b19c171c8168c5f1244987246c47f (patch) | |
| tree | f2dad70a4920f927f470157ad2eb53382a81ed03 /config | |
| parent | acec11626d2bb61c3728d634b04ac5afeaf4b17b (diff) | |
| parent | 69fd63e248d39cf2e10657646bc11e9e559e6e45 (diff) | |
| download | pleroma-bfe27c1b557b19c171c8168c5f1244987246c47f.tar.gz pleroma-bfe27c1b557b19c171c8168c5f1244987246c47f.zip | |
Merge branch '114_email_invites' into 'develop'
[#114] Email invites
See merge request pleroma/pleroma!541
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.md b/config/config.md index d4dad77b1..8282eab14 100644 --- a/config/config.md +++ b/config/config.md @@ -67,7 +67,8 @@ config :pleroma, Pleroma.Mailer, * `avatar_upload_limit`: File size limit of user’s profile avatars * `background_upload_limit`: File size limit of user’s profile backgrounds * `banner_upload_limit`: File size limit of user’s profile banners -* `registrations_open`: Enable registrations for anyone, invitations can be used when false. +* `registrations_open`: Enable registrations for anyone, invitations can be enabled when false. +* `invites_enabled`: Enable user invitations for admins (depends on `registrations_open: false`). * `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: |