Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'

# Conflicts:
#   CHANGELOG.md

diff --cc CHANGELOG.md
index d47e98cd4567d95e23e4a3387d7204e7888ff7f5,fa7818137bda45947f70e0524863b7e280e32d63..90d10fdbc5bcfd7264a2ba5345166e1812dd769b
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -42,9 -43,10 +43,11 @@@ The format is based on [Keep a Changelo
  - 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
 +- Reverse Proxy limiting `max_body_length` was incorrectly defined and only checked `Content-Length` headers which may not be sufficient in some circumstances
+ - MRF: fix use of unserializable keyword lists in describe() implementations
  
  ### Added
+ - Conversations: Add Pleroma-specific conversation endpoints and status posting extensions. Run the `bump_all_conversations` task again to create the necessary data.
  - **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`)