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

diff --cc CHANGELOG.md
index 575eb67b41f5ea32516b901890a56a2de460d2f4,9361fa26009dbe5a27065e2ad4855379624ed676..929cf5442fedf6ff4846fb51c4c483c7fd888de9
--- 1/CHANGELOG.md
--- 2/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.

diff --cc config/config.exs
Simple merge

diff --cc config/description.exs
Simple merge