Merge branch 'develop' into 'fix/admin-api-user-deletion'

# Conflicts:
#   CHANGELOG.md

diff --cc CHANGELOG.md
index 161f88176e09081e3550c25886ae85508693894c,5f071b7e2d8593221bd4ddfdd0e4eb6e967f9b4f..1a33b04e706e88fc1e6973abd52d276509c8e5aa
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -38,9 -42,12 +42,13 @@@ The format is based on [Keep a Changelo
  - Invalid SemVer version generation, when the current branch does not have commits ahead of tag/checked out on a tag
  - Pleroma.Upload base_url was not automatically whitelisted by MediaProxy. Now your custom CDN or file hosting will be accessed directly as expected.
  - Report email not being sent to admins when the reporter is a remote user
+ - MRF: ensure that subdomain_match calls are case-insensitive
+ - MRF: fix use of unserializable keyword lists in describe() implementations
 +- ActivityPub: Deactivated user deletion
  
  ### Added
+ - **Breaking:** MRF describe API, which adds support for exposing configuration information about MRF policies to NodeInfo.
+   Custom modules will need to be updated by adding, at the very least, `def describe, do: {:ok, %{}}` to the MRF policy modules.
  - MRF: Support for priming the mediaproxy cache (`Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy`)
  - MRF: Support for excluding specific domains from Transparency.
  - MRF: Support for filtering posts based on who they mention (`Pleroma.Web.ActivityPub.MRF.MentionPolicy`)

diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge

diff --cc test/user_test.exs
Simple merge