Merge branch 'develop' into 'new-user-emails'

diff --combined CHANGELOG.md
index c1e490c304fad52296c9a562fbd5562430dcc5ac,e89836b7a0ba75e490b4effdf78df0ab380661bd..8635ed4e7990f4db09728996247160554d8baa8d
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -19,6 -19,8 +19,8 @@@ The format is based on [Keep a Changelo
  - 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
+ - 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>
@@@ -49,8 -51,8 +51,10 @@@
  - Ability to set ActivityPub aliases for follower migration.
  - Configurable background job limits for RichMedia (link previews) and MediaProxyWarmingPolicy
  - Ability to define custom HTTP headers per each frontend
+ - MRF (`NoEmptyPolicy`): New MRF Policy which will deny empty statuses or statuses of only mentions from being created by local users
+ 
 +- New users will receive a simple email confirming their registration if no other emails will be dispatched. (e.g., Welcome, Confirmation, or Approval Required)
 +
  <details>
    <summary>API Changes</summary>
  - Admin API: (`GET /api/pleroma/admin/users`) filter users by `unconfirmed` status and `actor_type`.