diff options
| author | lain <lain@soykaf.club> | 2020-09-17 14:09:01 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-09-17 14:09:01 +0000 |
| commit | 7c60789ba540b8346c1a642b49c29df213217655 (patch) | |
| tree | 9df5bb75df8f1344768ebe4d26a14d1043820667 /docs/configuration/cheatsheet.md | |
| parent | f58262c673616661baf9750c216a07d239ae99c3 (diff) | |
| parent | 5426eb59976044f88247486da86a91b8f9eb35b5 (diff) | |
| download | pleroma-7c60789ba540b8346c1a642b49c29df213217655.tar.gz pleroma-7c60789ba540b8346c1a642b49c29df213217655.zip | |
Merge branch 'develop' into 'nondiscoverable-user-metadata'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'docs/configuration/cheatsheet.md')
| -rw-r--r-- | docs/configuration/cheatsheet.md | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md index 0c5d17ce3..054b8fe43 100644 --- a/docs/configuration/cheatsheet.md +++ b/docs/configuration/cheatsheet.md @@ -40,7 +40,6 @@ To add configuration to your config file, you can copy it from the base config. * `allow_relay`: Enable Pleroma’s Relay, which makes it possible to follow a whole instance. * `public`: Makes the client API in authenticated mode-only except for user-profiles. Useful for disabling the Local Timeline and The Whole Known Network. Note that there is a dependent setting restricting or allowing unauthenticated access to specific resources, see `restrict_unauthenticated` for more details. * `quarantined_instances`: List of ActivityPub instances where private (DMs, followers-only) activities will not be send. -* `managed_config`: Whenether the config for pleroma-fe is configured in [:frontend_configurations](#frontend_configurations) or in ``static/config.json``. * `allowed_post_formats`: MIME-type list of formats allowed to be posted (transformed into HTML). * `extended_nickname_format`: Set to `true` to use extended local nicknames format (allows underscores/dashes). This will break federation with older software for theses nicknames. |