From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Wed, 1 Apr 2020 17:08:14 +0000 (+0300)
Subject: Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships... 
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=98b96e45ababecb7554232787968f2f326f24e54;p=akkoma

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

# Conflicts:
#	CHANGELOG.md
---

98b96e45ababecb7554232787968f2f326f24e54
diff --cc CHANGELOG.md
index a391bf1fa,52e6c33f8..b41502a27
--- a/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`.