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 /CHANGELOG.md | |
| 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 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 8586ea8a0..2fa9bd1e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,6 +50,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - MRF: Support for rejecting reports from specific instances (`mrf_simple`) - MRF: Support for stripping avatars and banner images from specific instances (`mrf_simple`) - MRF: Support for running subchains. +- Configuration: `skip_thread_containment` option ### Changed - **Breaking:** Configuration: move from Pleroma.Mailer to Pleroma.Emails.Mailer |