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 /config | |
| 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 'config')
| -rw-r--r-- | config/config.exs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 33b7e713d..e90821d66 100644 --- a/config/config.exs +++ b/config/config.exs @@ -314,7 +314,9 @@ config :pleroma, :mrf_simple, federated_timeline_removal: [], report_removal: [], reject: [], - accept: [] + accept: [], + avatar_removal: [], + banner_removal: [] config :pleroma, :mrf_keyword, reject: [], |