From: feld <feld@feld.me>
Date: Mon, 8 Feb 2021 16:43:04 +0000 (+0000)
Subject: Merge branch 'develop' into 'docs/improve-mailer-settings-desc'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=85cb122986087062a192c31bc517f2698239819c;p=akkoma

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

# Conflicts:
#   CHANGELOG.md
---

85cb122986087062a192c31bc517f2698239819c
diff --cc CHANGELOG.md
index 15c75353f,9fc138d54..378e0466e
--- a/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>