Merge remote-tracking branch 'origin/develop' into password-reset

diff --cc lib/pleroma/web/router.ex
index 0d27571f2b43f01a3778870ae70bbdec660af5f1,abb332ec2f1f9eed9b232f83fa34f50b0fa7b654..dae1136176c794a3fa7f5489b8716a8c41263825
--- 1/lib/pleroma/web/router.ex
--- 2/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -744,29 -736,6 +736,12 @@@ defmodule Pleroma.Web.Router d
      get("/:version", Nodeinfo.NodeinfoController, :nodeinfo)
    end
  
-   scope "/", Pleroma.Web do
-     pipe_through(:api)
- 
-     get("/web/manifest.json", MastoFEController, :manifest)
-   end
- 
-   scope "/", Pleroma.Web do
-     pipe_through(:mastodon_html)
- 
-     get("/web/login", MastodonAPI.AuthController, :login)
-     delete("/auth/sign_out", MastodonAPI.AuthController, :logout)
- 
-     get("/web/*path", MastoFEController, :index)
- 
-     get("/embed/:id", EmbedController, :show)
-   end
- 
 +  scope "/", Pleroma.Web do
 +    pipe_through(:pleroma_html)
 +
 +    post("/auth/password", TwitterAPI.PasswordController, :request)
 +  end
 +
    scope "/proxy/", Pleroma.Web do
      get("/preview/:sig/:url", MediaProxy.MediaProxyController, :preview)
      get("/preview/:sig/:url/:filename", MediaProxy.MediaProxyController, :preview)