From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Thu, 12 Mar 2020 12:02:24 +0000 (+0400)
Subject: Merge remote-tracking branch 'origin/develop' into global-status-expiration
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=d1c7f8e576e31487544b57d67802843b8ef38388;p=akkoma

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

d1c7f8e576e31487544b57d67802843b8ef38388
diff --cc CHANGELOG.md
index ec6b0cb38,100228c6c..31156312c
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -3,7 -3,7 +3,14 @@@ All notable changes to this project wil
  
  The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
  
 +## [Unreleased]
++
++### Changed
++
++- MFR policy to set global expiration for all local Create activities
++
++
+ ## [2.0.0] - 2019-03-08
  ### Security
  - Mastodon API: Fix being able to request enourmous amount of statuses in timelines leading to DoS. Now limited to 40 per request.