Merge branch 'develop' into feature/report-notes

This commit is contained in:
Maxim Filippov 2019-12-12 02:16:23 +03:00
commit 3ecf131511
197 changed files with 3697 additions and 1058 deletions

View file

@ -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