From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 16 Dec 2021 00:05:36 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/develop' into live-dashboard
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=e1b89fe3aa2c03576a6f2418c1e83c0ed64707a3;p=akkoma

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

e1b89fe3aa2c03576a6f2418c1e83c0ed64707a3
diff --cc test/pleroma/web/plugs/frontend_static_plug_test.exs
index 18103fe4c,82e955c25..45cd70a2c
--- a/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"