logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: e48848dad0bf02770e87ace1c4859e94c5c8e14d
parent: 6ca82c18a738205483dbbef2fd4de662d70227fb
Author: kaniini <nenolod@gmail.com>
Date:   Sun, 21 Apr 2019 00:40:29 +0000

Merge branch 'patch-1' into 'develop'

Mention Mastodon 2.8+ follow import fix in changelog

See merge request pleroma/pleroma!1079

Diffstat:

MCHANGELOG.md1+
1 file changed, 1 insertion(+), 0 deletions(-)

diff --git 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