From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Fri, 10 Apr 2020 16:00:05 +0000 (+0400)
Subject: Merge remote-tracking branch 'origin/develop' into global-status-expiration
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=dd612f86ae85248062159d3d21f4a98cd3b4d65e;p=akkoma

Merge remote-tracking branch 'origin/develop' into global-status-expiration
---

dd612f86ae85248062159d3d21f4a98cd3b4d65e
diff --cc CHANGELOG.md
index 475fc5d89,fd5d5f800..74adae429
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -19,10 -18,9 +19,12 @@@ The format is based on [Keep a Changelo
  - Mastodon API: Added `/api/v1/notifications/:id/dismiss` endpoint.
  </details>
  
+ ### Fixed
+ - Support pagination in conversations API
+ 
 +### Changed
 +- MFR policy to set global expiration for all local Create activities
 +
- 
  ## [2.0.2] - 2020-04-08
  ### Added
  - Support for Funkwhale's `Audio` activity