From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Fri, 12 Jun 2020 14:25:29 +0000 (+0400)
Subject: Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=697cf920249b4f67bcc49aa923374d5fdc20809b;p=akkoma

Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
---

697cf920249b4f67bcc49aa923374d5fdc20809b
diff --cc CHANGELOG.md
index 575eb67b4,9361fa260..929cf5442
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -6,7 -6,7 +6,8 @@@ The format is based on [Keep a Changelo
  ## [unreleased]
  
  ### Changed
+ - MFR policy to set global expiration for all local Create activities
 +- OGP rich media parser merged with TwitterCard
  <details>
    <summary>API Changes</summary>
  - **Breaking:** Emoji API: changed methods and renamed routes.