Merge branch 'develop' into feature/report-notes
This commit is contained in:
commit
3ecf131511
197 changed files with 3697 additions and 1058 deletions
|
|
@ -529,7 +529,10 @@ defmodule Pleroma.Web.Router do
|
|||
|
||||
get("/users/:nickname/feed", Feed.FeedController, :feed)
|
||||
get("/users/:nickname", Feed.FeedController, :feed_redirect)
|
||||
end
|
||||
|
||||
scope "/", Pleroma.Web do
|
||||
pipe_through(:browser)
|
||||
get("/mailer/unsubscribe/:token", Mailer.SubscriptionController, :unsubscribe)
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue