From: lain <lain@soykaf.club>
Date: Sat, 20 Jun 2020 09:33:18 +0000 (+0000)
Subject: Merge branch 'develop' into '1865-media-only'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=7d542450b13742c6efa93246c172c8306e730d50;p=akkoma

Merge branch 'develop' into '1865-media-only'

# Conflicts:
#   CHANGELOG.md
---

7d542450b13742c6efa93246c172c8306e730d50
diff --cc CHANGELOG.md
index eee442817,3ee13904f..07bd9461f
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -6,7 -6,8 +6,9 @@@ The format is based on [Keep a Changelo
  ## [unreleased]
  
  ### Changed
+ - **Breaking:** Elixir >=1.9 is now required (was >= 1.8)
+ - In Conversations, return only direct messages as `last_status`
 +- Using the `only_media` filter on timelines will now exclude reblog media
  - MFR policy to set global expiration for all local Create activities
  - OGP rich media parser merged with TwitterCard
  <details>