Merge branch 'cycles-router-api-routes' into 'develop'

[akkoma] / lib / pleroma / web.ex

diff --git a/lib/pleroma/web.ex b/lib/pleroma/web.ex
index f1f9d6229683c354e49aa2ea8e3148d79b9df492..397e4d1e72920aa52e9d6ae107d3736a4e3585b2 100644 (file)
--- a/lib/pleroma/web.ex
+++ b/lib/pleroma/web.ex
@@ -35,9 +35,10 @@ defmodule Pleroma.Web do
       import Plug.Conn
 
       import Pleroma.Web.Gettext
-      import Pleroma.Web.Router.Helpers
       import Pleroma.Web.TranslationHelpers
 
+      alias Pleroma.Web.Router.Helpers, as: Routes
+
       plug(:set_put_layout)
 
       defp set_put_layout(conn, _) do
@@ -131,7 +132,8 @@ defmodule Pleroma.Web do
 
       import Pleroma.Web.ErrorHelpers
       import Pleroma.Web.Gettext
-      import Pleroma.Web.Router.Helpers
+
+      alias Pleroma.Web.Router.Helpers, as: Routes
 
       require Logger