Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements

diff --combined lib/pleroma/web/router.ex
index 9da10f1e5ff130b61f7b0e1efa10dead0912b9fc,efe67ad7a71a8f8bccb27bbe82b855fa5e75bbf7..c075fc7d3208dc287dc3948ee79bcc635a7ec717
--- 1/lib/pleroma/web/router.ex
--- 2/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -49,6 -49,7 +49,6 @@@ defmodule Pleroma.Web.Router d
      plug(Pleroma.Web.Plugs.BasicAuthDecoderPlug)
      plug(Pleroma.Web.Plugs.UserFetcherPlug)
      plug(Pleroma.Web.Plugs.SessionAuthenticationPlug)
 -    plug(Pleroma.Web.Plugs.LegacyAuthenticationPlug)
      plug(Pleroma.Web.Plugs.AuthenticationPlug)
    end
  
@@@ -242,6 -243,8 +242,8 @@@
      get("/chats/:id", ChatController, :show)
      get("/chats/:id/messages", ChatController, :messages)
      delete("/chats/:id/messages/:message_id", ChatController, :delete_message)
+ 
+     post("/backups", AdminAPIController, :create_backup)
    end
  
    scope "/api/pleroma/emoji", Pleroma.Web.PleromaAPI do
@@@ -372,6 -375,9 +374,9 @@@
        put("/mascot", MascotController, :update)
  
        post("/scrobble", ScrobbleController, :create)
+ 
+       get("/backups", BackupController, :index)
+       post("/backups", BackupController, :create)
      end
  
      scope [] do