Merge develop

diff --cc CHANGELOG.md
index a83de00f812e9ac7f2b34cf4092ca710bfae117d,7fc2231d147bb36f9a3d3df36fcbb996600f1cfa..71963d206e7a3bac5ef1e0cbd03c0fd487932383
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -6,9 -6,15 +6,16 @@@ 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
+ - Configuration: `:instance, rewrite_policy` moved to `:mrf, policies`, `:instance, :mrf_transparency` moved to `:mrf, :transparency`, `:instance, :mrf_transparency_exclusions` moved to `:mrf, :transparency_exclusions`. Old config namespace is deprecated.
+ 
  <details>
    <summary>API Changes</summary>
 +
  - **Breaking:** Emoji API: changed methods and renamed routes.
  </details>
  

diff --cc docs/API/admin_api.md
Simple merge

diff --cc lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
index 33586234085a7cfe94ee1594b3fa1bba36c83091,db2413dfe6015c6b916bc2bb862e2d8e035d2874..f9545d8950caf135aca2ec223ada5113a4ded57b
--- 1/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
--- 2/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
+++ b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
@@@ -644,13 -640,13 +640,13 @@@ defmodule Pleroma.Web.AdminAPI.AdminAPI
        action: "resend_confirmation_email"
      })
  
-     conn |> json("")
+     json(conn, "")
    end
  
 -  def stats(conn, _) do
 -    count = Stats.get_status_visibility_count()
 +  def stats(conn, params) do
 +    counters = Stats.get_status_visibility_count(params["instance"])
  
 -    json(conn, %{"status_visibility" => count})
 +    json(conn, %{"status_visibility" => counters})
    end
  
    defp page_params(params) do

diff --cc test/web/admin_api/controllers/admin_api_controller_test.exs
Simple merge