From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Mon, 13 Apr 2020 10:12:51 +0000 (+0400)
Subject: Merge branch 'develop' into global-status-expiration
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=dc8fa04192cc133749e762b78ec043e0902d046d;p=akkoma

Merge branch 'develop' into global-status-expiration
---

dc8fa04192cc133749e762b78ec043e0902d046d
diff --cc CHANGELOG.md
index 74adae429,36897503a..a0173351f
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -22,9 -21,8 +21,11 @@@ The format is based on [Keep a Changelo
  ### Fixed
  - Support pagination in conversations API
  
 +### Changed
 +- MFR policy to set global expiration for all local Create activities
 +
+ ## [unreleased-patch]
+ 
  ## [2.0.2] - 2020-04-08
  ### Added
  - Support for Funkwhale's `Audio` activity