diff options
author | Maksim Pechnikov <parallel588@gmail.com> | 2020-08-07 09:48:34 +0300 |
---|---|---|
committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-08-07 09:48:34 +0300 |
commit | 8e90cc58e7ec3f19f03d049ff541750f1ab4774e (patch) | |
tree | be0a4346827a52fcdfe034c489ede989320a24d2 /docs | |
parent | 6e6276b4f8a7a46c6038480f6a842339c5214d1c (diff) | |
parent | b9ebb55d2aabdf4c99b05efab9d4ad31b25f888d (diff) | |
download | pleroma-8e90cc58e7ec3f19f03d049ff541750f1ab4774e.tar.gz pleroma-8e90cc58e7ec3f19f03d049ff541750f1ab4774e.zip |
Merge branch 'develop' into feature/update-welcome-setting-in-description
Diffstat (limited to 'docs')
-rw-r--r-- | docs/configuration/cheatsheet.md | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md index 5891fc9b0..f23cf4fe4 100644 --- a/docs/configuration/cheatsheet.md +++ b/docs/configuration/cheatsheet.md @@ -207,6 +207,11 @@ config :pleroma, :mrf_user_allowlist, %{ * `sign_object_fetches`: Sign object fetches with HTTP signatures * `authorized_fetch_mode`: Require HTTP signatures for AP fetches +## Pleroma.User + +* `restricted_nicknames`: List of nicknames users may not register with. +* `email_blacklist`: List of email domains users may not register with. + ## Pleroma.ScheduledActivity * `daily_user_limit`: the number of scheduled activities a user is allowed to create in a single day (Default: `25`) |