summaryrefslogtreecommitdiff
path: root/config/config.md
diff options
context:
space:
mode:
authorRin Toshaka <rinpatch@sdf.org>2018-12-06 18:11:22 +0100
committerRin Toshaka <rinpatch@sdf.org>2018-12-06 18:11:22 +0100
commit88f92693f25c34f8ab82d4ed809b266bf5fb9ff8 (patch)
treed6115e451d0cd98672669c6ba93921f75f21e16a /config/config.md
parentca7b46fb3ba576fb7e67eba02654e6df9299392a (diff)
parent1d531fd2f32a7f8fff562a3122b30b8ccdccead0 (diff)
downloadpleroma-88f92693f25c34f8ab82d4ed809b266bf5fb9ff8.tar.gz
pleroma-88f92693f25c34f8ab82d4ed809b266bf5fb9ff8.zip
Merge develop
Diffstat (limited to 'config/config.md')
-rw-r--r--config/config.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/config.md b/config/config.md
index 47e838dd6..d90d18566 100644
--- a/config/config.md
+++ b/config/config.md
@@ -39,6 +39,7 @@ Note: `strip_exif` has been replaced by `Pleroma.Upload.Filter.Mogrify`.
* `Pleroma.Web.ActivityPub.MRF.DropPolicy`: Drops all activities. It generally doesn’t makes sense to use in production
* `Pleroma.Web.ActivityPub.MRF.SimplePolicy`: Restrict the visibility of activities from certains instances (See ``:mrf_simple`` section)
* `Pleroma.Web.ActivityPub.MRF.RejectNonPublic`: Drops posts with non-public visibility settings (See ``:mrf_rejectnonpublic`` section)
+ * `Pleroma.Web.ActivityPub.MRF.EnsureRePrepended`: Rewrites posts to ensure that replies to posts with subjects do not have an identical subject and instead begin with re:.
* `public`: Makes the client API in authentificated mode-only except for user-profiles. Useful for disabling the Local Timeline and The Whole Known Network.
* `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 this config or in ``static/config.json``