diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-08-13 02:45:47 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-08-13 02:45:47 +0000 |
| commit | 984d7be1a4b4d1e1024a9f5d5aaee6252c553279 (patch) | |
| tree | 837a101fb853c673caec14bfee51aaca82331dd6 /docs/config.md | |
| parent | b0fad153e1d4bf6c95c18bdab92a42978b729108 (diff) | |
| parent | f46cd7e9c750b9c4c36f0a6c4b3a1ffd2f94a6d0 (diff) | |
| download | pleroma-984d7be1a4b4d1e1024a9f5d5aaee6252c553279.tar.gz pleroma-984d7be1a4b4d1e1024a9f5d5aaee6252c553279.zip | |
Merge branch 'feature/remove-disable-blocks' into 'develop'
config: remove legacy activitypub accept_blocks setting
See merge request pleroma/pleroma!1556
Diffstat (limited to 'docs/config.md')
| -rw-r--r-- | docs/config.md | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/docs/config.md b/docs/config.md index 55311b76d..d0247ef9c 100644 --- a/docs/config.md +++ b/docs/config.md @@ -329,7 +329,6 @@ config :pleroma, Pleroma.Web.Endpoint, This will make Pleroma listen on `127.0.0.1` port `8080` and generate urls starting with `https://example.com:2020` ## :activitypub -* ``accept_blocks``: Whether to accept incoming block activities from other instances * ``unfollow_blocked``: Whether blocks result in people getting unfollowed * ``outgoing_blocks``: Whether to federate blocks to other instances * ``deny_follow_blocked``: Whether to disallow following an account that has blocked the user in question |