diff options
| author | lain <lain@soykaf.club> | 2019-06-04 14:58:13 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-06-04 14:58:13 +0000 |
| commit | f178a6f3f0d152a5e75c82da08195ee2d7fd3612 (patch) | |
| tree | 3adf7ccf852cf4f4f12804a5f4427583905e17b7 /config | |
| parent | 0eb7464c10df109e8aacf734bb092f69192ab5c2 (diff) | |
| parent | 1e7bb69a957c279eb75ed72cca779caa9d8f25ce (diff) | |
| download | pleroma-f178a6f3f0d152a5e75c82da08195ee2d7fd3612.tar.gz pleroma-f178a6f3f0d152a5e75c82da08195ee2d7fd3612.zip | |
Merge branch 'issue/941' into 'develop'
[#941] add option skip_thread_containment
See merge request pleroma/pleroma!1237
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 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 |