Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api

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

diff --cc lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
Simple merge

diff --cc lib/pleroma/web/router.ex
index 87fd664f6a8a97d9cc495998d0b825177bb6e7c8,72627515888ac88302ccd936e1e8727613d58e9d..924254895030a87bd512c8c53d18dd778a4ab19f
--- 1/lib/pleroma/web/router.ex
--- 2/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -103,11 -104,8 +104,10 @@@ defmodule Pleroma.Web.Router d
      get("/domain_blocks", MastodonAPIController, :empty_array)
      get("/follow_requests", MastodonAPIController, :empty_array)
      get("/mutes", MastodonAPIController, :empty_array)
-     get("/lists", MastodonAPIController, :empty_array)
  
      get("/timelines/home", MastodonAPIController, :home_timeline)
 +
 +    get("/timelines/direct", MastodonAPIController, :dm_timeline)
  
      get("/favourites", MastodonAPIController, :favourites)
  

diff --cc test/support/factory.ex
Simple merge

diff --cc test/web/mastodon_api/mastodon_api_controller_test.exs
Simple merge