Merge branch 'develop' into frontend-admin-api

2020-11-11 19:53:40 +04:00 · 2020-11-11 19:53:40 +04:00 · 08cbd655d1
commit 08cbd655d1
parent e46c95b826 3cd7ea693f
72 changed files with 1090 additions and 643 deletions
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@ -401,6 +401,7 @@ defmodule Pleroma.Web.Router do
  scope "/api/v1/pleroma", Pleroma.Web.PleromaAPI do
    pipe_through(:api)
    get("/accounts/:id/scrobbles", ScrobbleController, :index)
+    get("/federation_status", InstancesController, :show)
  end

  scope "/api/v1", Pleroma.Web.MastodonAPI do