diff options
| author | kaniini <nenolod@gmail.com> | 2019-05-22 19:03:14 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-05-22 19:03:14 +0000 |
| commit | 75e78d4e239a5c999306e92b181b0e29c52dc9db (patch) | |
| tree | 9ea3b053306a718930083fe662c1d81e2e39137a /docs/config.md | |
| parent | f0516d911437527891f19f0936fb558e817a75ac (diff) | |
| parent | 7d9b33b3cebeed451210f754a8c34cc14a9e969b (diff) | |
| download | pleroma-75e78d4e239a5c999306e92b181b0e29c52dc9db.tar.gz pleroma-75e78d4e239a5c999306e92b181b0e29c52dc9db.zip | |
Merge branch 'feature/mrf-user-filter' into 'develop'
mrf: add support for filtering users
See merge request pleroma/pleroma!1188
Diffstat (limited to 'docs/config.md')
| -rw-r--r-- | docs/config.md | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/config.md b/docs/config.md index be0cbc2dc..67b062fe9 100644 --- a/docs/config.md +++ b/docs/config.md @@ -220,6 +220,9 @@ relates to mascots on the mastodon frontend * `federated_timeline_removal`: List of instances to remove from Federated (aka The Whole Known Network) Timeline * `reject`: List of instances to reject any activities from * `accept`: List of instances to accept any activities from +* `report_removal`: List of instances to reject reports from +* `avatar_removal`: List of instances to strip avatars from +* `banner_removal`: List of instances to strip banners from ## :mrf_rejectnonpublic * `allow_followersonly`: whether to allow followers-only posts |