Merge branch 'develop' into fix/reports-from-admins

diff --cc CHANGELOG.md
index 777847fa25c46c0ecf2112293b8af6002c1934e8,1dbdb3f4e04175052b9396185b8718742a49afbc..9fc138d5405be576849048c5a6d556840f5edec6
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -18,7 -18,7 +18,8 @@@ 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
 +- Admins no longer receive notifications for reports if they are the actor making the report.
  
  <details>
    <summary>API Changes</summary>