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 /config | |
| 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 'config')
| -rw-r--r-- | config/config.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 5e57af87b..6fc127d4c 100644 --- a/config/config.exs +++ b/config/config.exs @@ -67,7 +67,8 @@ config :pleroma, :mrf_simple, media_removal: [], media_nsfw: [], federated_timeline_removal: [], - reject: [] + reject: [], + accept: [] config :pleroma, :media_proxy, enabled: false, |