diff options
| author | lain <lain@soykaf.club> | 2020-11-17 15:01:38 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-11-17 15:01:38 +0100 |
| commit | fec1ed802ef44a700df27aa132146f79e9e4cd6d (patch) | |
| tree | 6bbb39b647305521209bebbd7bdea3e4be012d1c /config/config.exs | |
| parent | 81293e5aadd5f1dfe7f90f6a71f625ef86cf3359 (diff) | |
| parent | 9b9afe6b3fde77ef005629fe2d198160c8f465a1 (diff) | |
| download | pleroma-fec1ed802ef44a700df27aa132146f79e9e4cd6d.tar.gz pleroma-fec1ed802ef44a700df27aa132146f79e9e4cd6d.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index c0b6ac1d6..0b8a75aad 100644 --- a/config/config.exs +++ b/config/config.exs @@ -562,7 +562,8 @@ config :pleroma, Oban, background: 5, remote_fetcher: 2, attachments_cleanup: 5, - new_users_digest: 1 + new_users_digest: 1, + mute_expire: 5 ], plugins: [Oban.Plugins.Pruner], crontab: [ @@ -820,7 +821,7 @@ config :pleroma, :restrict_unauthenticated, config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: false config :pleroma, :mrf, - policies: Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy, + policies: [Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy, Pleroma.Web.ActivityPub.MRF.TagPolicy], transparency: true, transparency_exclusions: [] |