diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-06-21 07:09:57 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-06-21 07:09:57 +0000 |
| commit | ad28854f477141dc9b6a01f7e4465c07bb0f896c (patch) | |
| tree | 272e870fa168507f2c7aaa8702e3bdfa831f0b61 /CONFIGURATION.md | |
| parent | 90cf75f4a781f2eb7016a4a165a8617d4352451b (diff) | |
| parent | 60d6038be57aaa90f1d8ba9a05ecbee03b59fc82 (diff) | |
| download | pleroma-ad28854f477141dc9b6a01f7e4465c07bb0f896c.tar.gz pleroma-ad28854f477141dc9b6a01f7e4465c07bb0f896c.zip | |
Merge branch 'feature/mrf-simple-accept-lists' into 'develop'
mrf simple: add accept lists
See merge request pleroma/pleroma!231
Diffstat (limited to 'CONFIGURATION.md')
| -rw-r--r-- | CONFIGURATION.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/CONFIGURATION.md b/CONFIGURATION.md index 4174dd114..6b2821b21 100644 --- a/CONFIGURATION.md +++ b/CONFIGURATION.md @@ -49,7 +49,8 @@ Restricts the visibility of posts from certain instances. media_removal: [], media_nsfw: [], federated_timeline_removal: [], - reject: [] + reject: [], + accept: [] * `media_removal`: posts from these instances will have attachments removed @@ -58,6 +59,7 @@ Restricts the visibility of posts from certain instances. * `federated_timeline_removal`: posts from these instances will be marked as unlisted * `reject`: posts from these instances will be dropped +* `accept`: if not empty, only posts from these instances will be accepted ### RejectNonPublic |