Merge branch 'pleroma-conversations' into 'develop'

Extended Pleroma Conversations

See merge request pleroma/pleroma!1535

diff --cc CHANGELOG.md
index 5f071b7e2d8593221bd4ddfdd0e4eb6e967f9b4f,2d6eac4c5d6e235767cf35fd84756c4660d75c5f..fa7818137bda45947f70e0524863b7e280e32d63
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -43,9 -42,9 +43,10 @@@ 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
 +- 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`)

diff --cc lib/pleroma/user.ex
Simple merge

diff --cc lib/pleroma/web/mastodon_api/views/status_view.ex
Simple merge

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