どっこらよっこいし
c023ebc87a (upstream/main) Limit count to pending&trending on admin/trends/tags page (#35120)
ebc6897afb Extract method to DRY up month/year grouping in `AnnualReport::TimeSeries` class (#35113)
b08ccaa5b3 Extract `Account::Mappings` concern from "interactions" (#35119)
b9b1500fc5 fix: Update hashtags when (un)following a hashtag (#35101)
d28a4428b5 refactor: Use new main menu as "Getting started" column in Advanced Web UI (#35117)
6166e61638 fix: Keep user on Compose page when changing screen size, #34937 (#35105)
e5aa8c1ff3 New Crowdin Translations (automated) (#35090)
8837fd8c54 Update rubocop to version 1.77.0 (#35128)
ac039d5f13 Fix clicking a status multiple times causing duplicate entries in browser history (#35118)
adf812efb3 Fix missing terms of services link (#35115)
3f743b1a07 fix: Fix SCSS lint warnings (#35102)
\Master?/ \ますたー/
Merged mastodon/mastodon at c023ebc87a9a925bbe9bb36938c220e01b7d1747.