diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-10 13:27:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-10 13:27:40 +0100 |
| commit | ee7e49d1b1323618e16026bc8db8ab7f9459cc2d (patch) | |
| tree | 86d51ac7c13d2b08fae534a44524c2ef8b131315 /app/controllers/api/v1/timelines | |
| parent | b2a25d446a9f4368ad9d1240b9da30bc33942da5 (diff) | |
| parent | c4d2c729245fab1dda31d0de73be9bc03217b06a (diff) | |
Merge pull request #1910 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/v1/timelines')
| -rw-r--r-- | app/controllers/api/v1/timelines/public_controller.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/controllers/api/v1/timelines/public_controller.rb b/app/controllers/api/v1/timelines/public_controller.rb index 2ee5aaf18..493fe4776 100644 --- a/app/controllers/api/v1/timelines/public_controller.rb +++ b/app/controllers/api/v1/timelines/public_controller.rb @@ -35,7 +35,6 @@ class Api::V1::Timelines::PublicController < Api::BaseController def public_feed PublicFeed.new( current_account, - locale: content_locale, local: truthy_param?(:local), remote: truthy_param?(:remote), only_media: truthy_param?(:only_media), |