Merge branch 'develop' into 'docs/improve-mailer-settings-desc'

# Conflicts:
#   CHANGELOG.md

diff --cc CHANGELOG.md
index 15c75353f6bdfb698a294155b6c164629bbcb8ca,9fc138d5405be576849048c5a6d556840f5edec6..378e0466ec39c4e823f7205618f964ab902ce4b5
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -18,8 -18,8 +18,9 @@@ The format is based on [Keep a Changelo
  - Deprecated `Pleroma.Uploaders.S3, :public_endpoint`. Now `Pleroma.Upload, :base_url` is the standard configuration key for all uploaders.
  - Improved Apache webserver support: updated sample configuration, MediaProxy cache invalidation verified with the included sample script
  - Improve OAuth 2.0 provider support. A missing `fqn` field was added to the response, but does not expose the user's email address.
- - Provide redirect of external posts from `/notice/:id` to their original URL.
+ - Provide redirect of external posts from `/notice/:id` to their original URL
+ - Admins no longer receive notifications for reports if they are the actor making the report.
 +- Improved Mailer configuration setting descriptions for AdminFE.
  
  <details>
    <summary>API Changes</summary>