Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships...

# Conflicts:
#	CHANGELOG.md

diff --cc CHANGELOG.md
index a391bf1fa2ffdc45869f9ca33031ba30b33b6f79,52e6c33f81ffa9e6e29cfdb39722b2bd982a4cd4..b41502a272e736cfc98f94fd57b4b3a00cb31284
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -13,7 -13,7 +13,8 @@@ The format is based on [Keep a Changelo
  ### Added
  - NodeInfo: `pleroma:api/v1/notifications:include_types_filter` to the `features` list.
  - Configuration: `:restrict_unauthenticated` setting, restrict access for unauthenticated users to timelines (public and federate), user profiles and statuses.
+ - New HTTP adapter [gun](https://github.com/ninenines/gun). Gun adapter requires minimum OTP version of 22.2 otherwise Pleroma won’t start. For hackney OTP update is not required.
 +- Configuration: `:extensions/:output_relationships_in_statuses_by_default` option (if `false`, disables the output of account/pleroma/relationship for statuses and notifications by default, breaking the compatibility with older PleromaFE versions).
  <details>
    <summary>API Changes</summary>
  - Mastodon API: Support for `include_types` in `/api/v1/notifications`.

diff --cc config/config.exs
Simple merge

diff --cc config/description.exs
Simple merge

diff --cc lib/mix/tasks/pleroma/benchmark.ex
Simple merge

diff --cc test/web/mastodon_api/controllers/notification_controller_test.exs
Simple merge