Merge branch 'main' into glitch-soc/merge-upstream

2022-10-31 08:37:32 +01:00
parent 5fd758fad1 26478f461c
commit 1fe4e5e38c
2 changed files with 0 additions and 2 deletions
--- a/app/controllers/api/v1/timelines/tag_controller.rb
+++ b/app/controllers/api/v1/timelines/tag_controller.rb
@ -36,7 +36,6 @@ class Api::V1::Timelines::TagController < Api::BaseController
    TagFeed.new(
      @tag,
      current_account,
-      locale: content_locale,
      any: params[:any],
      all: params[:all],
      none: params[:none],