From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Thu, 22 Jul 2021 18:41:11 +0000 (+0000)
Subject: Merge branch 'mkljczk-develop-patch-60115' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=7acdab1f305bac744a302e3b44e2e920d6bc8a47;hp=7acdab1f305bac744a302e3b44e2e920d6bc8a47;p=akkoma

Merge branch 'mkljczk-develop-patch-60115' into 'develop'

MastodonAPI: Fix list timelines

Closes mastofe#89 and #2693

See merge request pleroma/pleroma!3477
---