projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature...
[akkoma]
/
lib
/
pleroma
/
web
/
web.ex
diff --git
a/lib/pleroma/web/web.ex
b/lib/pleroma/web/web.ex
index 4f618743df776535231bd4ddd633c952d67606e5..66813e4ddaffa5ad1fd4f807047e639c86a29cc0 100644
(file)
--- a/
lib/pleroma/web/web.ex
+++ b/
lib/pleroma/web/web.ex
@@
-27,7
+27,11
@@
defmodule Pleroma.Web do
import Pleroma.Web.Gettext
import Pleroma.Web.Router.Helpers
import Pleroma.Web.Gettext
import Pleroma.Web.Router.Helpers
- plug(:put_layout, Application.get_env(:pleroma, :app_template, "app.html"))
+ plug(:set_put_layout)
+
+ defp set_put_layout(conn, _) do
+ put_layout(conn, Pleroma.Config.get(:app_layout, "app.html"))
+ end
end
end
end
end