二度寝もりもり 
295ad6f19a (upstream/main) Prep work for coverage addition to `ActivityPub::DeliveryWorker` spec (#32944)
30a7986569 Add coverage for fixing the thing with the dates in the search area (#32958)
da826fe959 Use hash arguments to `order` when possible (Rails 7.2) (#32915)
477412d62a Use hash arguments to `select` when possible (Rails 7.2) (#32917)
3e44dca0b4 Change dependency from annotate to annotaterb (#30232)
c0c34d35e2 Move self destruct check to `config_for` and add constant for verifier string (#32943)
911d7dbbf6 Fix `min_id` and `max_id` causing error in search API (#32857)
9a46329fbd Streaming: add development logging of database queries (#32945)
03ee08c2da Use `nil` instead of `false` for datetime value in spec (#32926)
d8e907fae3 Update dependency aws-sdk-s3 to v1.171.0 (#32901)
c511cbcd6c Extract constants for controller `LIMIT` queries (#32921)
16addf47c7 Reduce long lines in `relationships/show` view (#32922)
続
be413d67de `Form::Import` spec reduce factories (#32924)
02985aae69 New Crowdin Translations (automated) (#32927)
49a12a2df9 Update dependency @formatjs/cli to v6.3.11 (#32950)
5b68f4b070 Update libretranslate/libretranslate Docker tag to v1.6.2 (#32951)
60801ab914 Add missing autofocus on boost modal (#32953)
bcf5d30e01 Add OpenTelemetry VCS attributes (#32904)
1c6f53e70f Use `with_options` blocks in `Associations` concern (#32840)
a1ac2a73ff Remove remnants of embed views (#32419)
CONFLICT (content): Merge conflict in app/models/concerns/account/associations.rb
CONFLICT (content): Merge conflict in spec/workers/activitypub/delivery_worker_spec.rb
ほい
\Master?/ \ますたー/
Merged mastodon/mastodon at 295ad6f19a016b3f16e1201ffcbb1b3ad6b455a2.
@zundan ダジャレを検出しました（検出ワード: CONFLICT, CONFLICT）