Merge branch 'patch-1' into 'develop'

Mention Mastodon 2.8+ follow import fix in changelog See merge request pleroma/pleroma!1079
2019-04-21 00:40:29 +00:00 · 2019-04-21 00:40:29 +00:00 · e48848dad0
parent 6ca82c18a7 25fa10499a
commit e48848dad0
1 changed files with 1 additions and 0 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -67,6 +67,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - MediaProxy: Parse name from content disposition headers even for non-whitelisted types
 - MediaProxy: S3 link encoding
 - Rich Media: Reject any data which cannot be explicitly encoded into JSON
+- Pleroma API: Importing follows from Mastodon 2.8+
 - Mastodon API: `/api/v1/favourites` serving only public activities
 - Mastodon API: Reblogs having `in_reply_to_id` - `null` even when they are replies
 - Mastodon API: Streaming API broadcasting wrong activity id