diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2020-09-17 14:54:00 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-09-17 14:54:00 +0300 |
| commit | 44e8b6037ae71881327451dcf7d9351f1ba82674 (patch) | |
| tree | d78e161239f819c3310248f3d1685bc481f0504c /docs/configuration/cheatsheet.md | |
| parent | c5830ac037c0c344bd22b674c41f4dc244a088aa (diff) | |
| parent | c5acbf8a1bd1a14ea82610cb3f69b8ebbb3ea28b (diff) | |
| download | pleroma-44e8b6037ae71881327451dcf7d9351f1ba82674.tar.gz pleroma-44e8b6037ae71881327451dcf7d9351f1ba82674.zip | |
Merge branch 'develop' into feature/expire-mutes
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. |