From: Mark Felder <feld@feld.me>
Date: Thu, 4 Feb 2021 18:37:20 +0000 (-0600)
Subject: Merge branch 'develop' into fix/reports-from-admins
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=d04737229196a08db4bc726f8afd55a64dcf8304;hp=--cc;p=akkoma

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

d04737229196a08db4bc726f8afd55a64dcf8304
diff --cc CHANGELOG.md
index 777847fa2,1dbdb3f4e..9fc138d54
--- a/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>