Merge remote-tracking branch 'origin/develop' into live-dashboard

diff --cc config/config.exs
Simple merge

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

diff --cc mix.exs
Simple merge

diff --cc mix.lock
Simple merge

diff --cc test/pleroma/web/plugs/frontend_static_plug_test.exs
index 18103fe4cc46db29ca90e3f3cf8cf611369e16fa,82e955c25ddae611c4ba1e87bb5e1d6d81a88da6..45cd70a2c32cf80f8b6932cd18e08e1f773139b2
--- 1/test/pleroma/web/plugs/frontend_static_plug_test.exs
--- 2/test/pleroma/web/plugs/frontend_static_plug_test.exs
+++ b/test/pleroma/web/plugs/frontend_static_plug_test.exs
@@@ -94,11 -94,8 +94,9 @@@ defmodule Pleroma.Web.Plugs.FrontendSta
        "internal",
        ".well-known",
        "nodeinfo",
-       "web",
        "auth",
-       "embed",
        "proxy",
 +      "phoenix",
        "test",
        "user_exists",
        "check_password"