diff options
| author | kaniini <nenolod@gmail.com> | 2019-05-22 19:03:14 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-05-22 19:03:14 +0000 |
| commit | 75e78d4e239a5c999306e92b181b0e29c52dc9db (patch) | |
| tree | 9ea3b053306a718930083fe662c1d81e2e39137a /CHANGELOG.md | |
| parent | f0516d911437527891f19f0936fb558e817a75ac (diff) | |
| parent | 7d9b33b3cebeed451210f754a8c34cc14a9e969b (diff) | |
| download | pleroma-75e78d4e239a5c999306e92b181b0e29c52dc9db.tar.gz pleroma-75e78d4e239a5c999306e92b181b0e29c52dc9db.zip | |
Merge branch 'feature/mrf-user-filter' into 'develop'
mrf: add support for filtering users
See merge request pleroma/pleroma!1188
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c94669db..7869e299b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,6 +43,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Emoji packs and emoji pack manager - Object pruning (`mix pleroma.database prune_objects`) - OAuth: added job to clean expired access tokens +- MRF: Support for rejecting reports from specific instances (`mrf_simple`) +- MRF: Support for stripping avatars and banner images from specific instances (`mrf_simple`) ### Changed - **Breaking:** Configuration: move from Pleroma.Mailer to Pleroma.Emails.Mailer |