diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-11-25 01:43:11 +0900 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-11-25 01:43:11 +0900 |
| commit | fd24467b923bd09850979600aeb9a46f8f0c7967 (patch) | |
| tree | caed7d4448e3d89f796c92eed5c501690d8ee62a /config | |
| parent | 114930b5fd816657c21c5fbe33845fd3742c9c23 (diff) | |
| parent | 937d6c6b32fc735cb5a56d9a3d97a6b2e8f37f68 (diff) | |
| download | pleroma-fd24467b923bd09850979600aeb9a46f8f0c7967.tar.gz pleroma-fd24467b923bd09850979600aeb9a46f8f0c7967.zip | |
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 75f463797..bf2b3f6e2 100644 --- a/config/config.exs +++ b/config/config.exs @@ -381,6 +381,10 @@ config :pleroma, :mrf_vocabulary, accept: [], reject: [] +config :pleroma, :mrf_object_age, + threshold: 172_800, + actions: [:delist, :strip_followers] + config :pleroma, :rich_media, enabled: true, ignore_hosts: [], |
