projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'simplepolicy-announce-leak' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web.ex
diff --git
a/lib/pleroma/web.ex
b/lib/pleroma/web.ex
index 8630f244b8505dc5bba489fa88f72061f1b65396..24751faba4a3928158cc7c288586e96470259392 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 Plug.Conn
import Pleroma.Web.Gettext
- import Pleroma.Web.Router.Helpers
import Pleroma.Web.TranslationHelpers
import Pleroma.Web.TranslationHelpers
+ alias Pleroma.Web.Router.Helpers, as: Routes
+
plug(:set_put_layout)
defp set_put_layout(conn, _) do
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.ErrorHelpers
import Pleroma.Web.Gettext
- import Pleroma.Web.Router.Helpers
+
+ alias Pleroma.Web.Router.Helpers, as: Routes
require Logger
require Logger