diff options
author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-06-05 12:54:30 +0700 |
---|---|---|
committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-06-05 12:54:30 +0700 |
commit | 6ba9055b51a454baaf063943e72a39006f7e5fad (patch) | |
tree | ca54523b21a7fe5a5ef0c99b2032fc0f899d40a8 /config/config.exs | |
parent | 9ce928d8238877f870e099cb2fe010d322717856 (diff) | |
parent | 5188add534a1532ef323a0fec3503f8e96dfe762 (diff) | |
download | pleroma-6ba9055b51a454baaf063943e72a39006f7e5fad.tar.gz pleroma-6ba9055b51a454baaf063943e72a39006f7e5fad.zip |
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
Diffstat (limited to 'config/config.exs')
-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 7d70c1a5e..a3f33cfbb 100644 --- a/config/config.exs +++ b/config/config.exs @@ -243,7 +243,8 @@ config :pleroma, :instance, max_report_comment_size: 1000, safe_dm_mentions: false, healthcheck: false, - remote_post_retention_days: 90 + remote_post_retention_days: 90, + skip_thread_containment: false config :pleroma, :app_account_creation, enabled: true, max_requests: 25, interval: 1800 |