aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/router.ex
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-03-14 22:33:20 +0300
committerrinpatch <rinpatch@sdf.org>2019-03-14 22:33:20 +0300
commitcbdd11c38111fd7c195983f40265b675e1201d4e (patch)
tree44c63ed6430a743cfe589fed5213467a0dd6dabb /lib/pleroma/web/router.ex
parent355f285a8693934fbc8205c2c9ecde0a758fc158 (diff)
parent34fc0dca2e879bcbb73acc80fdc72678411d0ebf (diff)
downloadpleroma-cbdd11c38111fd7c195983f40265b675e1201d4e.tar.gz
Merge develop to bump elixir version in the CI so I don't get failing formatting
Diffstat (limited to 'lib/pleroma/web/router.ex')
-rw-r--r--lib/pleroma/web/router.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 65a90e31e..c56e4a421 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -631,8 +631,8 @@ end
defmodule Fallback.RedirectController do
use Pleroma.Web, :controller
- alias Pleroma.Web.Metadata
alias Pleroma.User
+ alias Pleroma.Web.Metadata
def redirector(conn, _params, code \\ 200) do
conn