Merge branch 'feature/mrf-user-filter' into 'develop'

mrf: add support for filtering users

See merge request pleroma/pleroma!1188
This commit is contained in:
kaniini 2019-05-22 19:03:14 +00:00
commit 75e78d4e23
7 changed files with 133 additions and 9 deletions

View file

@ -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