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

# Conflicts:
#   CHANGELOG.md

diff --cc CHANGELOG.md
index eee4428172b94a9af83df7e56a60188382611d9c,3ee13904f352e6eb3ead49cd67e3dd24ae6f106b..07bd9461f7469f894890f7e0501de017ea71dd04
--- 1/CHANGELOG.md
--- 2/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>

diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge