Merge remote-tracking branch 'origin/develop' into notice-routes
This commit is contained in:
commit
db2bf55e9b
4319 changed files with 9915 additions and 14432 deletions
|
|
@ -14,7 +14,6 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
|
|||
alias Pleroma.Web.Router.Helpers
|
||||
|
||||
plug(:put_layout, :static_fe)
|
||||
plug(:put_view, Pleroma.Web.StaticFE.StaticFEView)
|
||||
plug(:assign_id)
|
||||
|
||||
@page_keys ["max_id", "min_id", "limit", "since_id", "order"]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue