Merge branch 'develop' into feature/tag_feed

diff --cc lib/pleroma/web/router.ex
index 871f3bf85668ade5d52711e1be3c2c5685e3295f,f6c1282832b23de5d5d565a931d950ffbdebd342..b32cd7c90c4ed422a42495ff189aab509d24517a
--- 1/lib/pleroma/web/router.ex
--- 2/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -526,11 -527,12 +527,14 @@@ defmodule Pleroma.Web.Router d
      get("/notice/:id", OStatus.OStatusController, :notice)
      get("/notice/:id/embed_player", OStatus.OStatusController, :notice_player)
  
 -    get("/users/:nickname/feed", Feed.FeedController, :feed)
 -    get("/users/:nickname", Feed.FeedController, :feed_redirect)
 +    get("/users/:nickname/feed", Feed.UserController, :feed, as: :user_feed)
 +    get("/users/:nickname", Feed.UserController, :feed_redirect, as: :user_feed)
 +
 +    get("/tags/:tag", Feed.TagController, :feed, as: :tag_feed)
+   end
  
+   scope "/", Pleroma.Web do
+     pipe_through(:browser)
      get("/mailer/unsubscribe/:token", Mailer.SubscriptionController, :unsubscribe)
    end
  

diff --cc test/user_test.exs
Simple merge