From: lain <lain@soykaf.club>
Date: Mon, 6 Apr 2020 12:51:35 +0000 (+0000)
Subject: Merge branch 'featureflag/emoji_reactions' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=1d4ab06505ec5143dbb1d78d718fa9efd1497751;p=akkoma

Merge branch 'featureflag/emoji_reactions' into 'develop'

Add emoji reactions to features in nodeinfo

See merge request pleroma/pleroma!2313
---

1d4ab06505ec5143dbb1d78d718fa9efd1497751
diff --cc CHANGELOG.md
index 52e6c33f8,747d84d48..b6e5d807c
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -12,8 -12,8 +12,9 @@@ The format is based on [Keep a Changelo
  
  ### Added
  - NodeInfo: `pleroma:api/v1/notifications:include_types_filter` to the `features` list.
+ - NodeInfo: `pleroma_emoji_reactions` 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.
  <details>
    <summary>API Changes</summary>
  - Mastodon API: Support for `include_types` in `/api/v1/notifications`.