diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-07-15 17:10:27 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-07-15 17:10:27 -0500 |
| commit | ffb4eb9779ddd28ecee84c06e8dc58f4a4daaa38 (patch) | |
| tree | b397d1192c69a7d089c86d41b6e09e89954ea798 /lib/pleroma/web/web.ex | |
| parent | e912f81c828cc7e1d2c0dff8daed3ad52f407a61 (diff) | |
| parent | 03bcb40883dafa2886110e2b625c4cc5c21106f1 (diff) | |
| download | pleroma-ffb4eb9779ddd28ecee84c06e8dc58f4a4daaa38.tar.gz | |
Merge branch 'develop' into feature/matstodon-statuses-by-name
Diffstat (limited to 'lib/pleroma/web/web.ex')
| -rw-r--r-- | lib/pleroma/web/web.ex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/web/web.ex b/lib/pleroma/web/web.ex index 66813e4dd..b42f6887e 100644 --- a/lib/pleroma/web/web.ex +++ b/lib/pleroma/web/web.ex @@ -23,9 +23,11 @@ defmodule Pleroma.Web do def controller do quote do use Phoenix.Controller, namespace: Pleroma.Web + import Plug.Conn import Pleroma.Web.Gettext import Pleroma.Web.Router.Helpers + import Pleroma.Web.TranslationHelpers plug(:set_put_layout) |