先にやっちまおう
a4ec187a20 (upstream/main) Change the wording of the dismissable explore prompt (#25917)
bbea052935 Fix emoji picker button scrolling with textarea content in single-column view (#25304)
317cd26fba Remove queued_at value from pubsub payloads (#26173)
12a6cf569e Storage: add :azure to remaining callers (#26080)
6c3c5bbbc3 Fix crash when processing Flag activity with no status (#26189)
b4e739ff0f Change interaction modal in web UI (#26075)
1e4ccc655a Add role badges to the WebUI (#25649)
ddaf200c78 Refactor streaming's filtering logic & improve documentation (#26213)
1814990a3d Fix wrong filters sometimes applying in streaming (#26159)
812a84ff5f Migrate to request specs in `/api/v2/filters` (#25721)
f48d345de1 Use correct naming on controller concern specs (#26197)
おや
CONFLICT (content): Merge conflict in config/routes.rb
Keybaseの分でした
\Master?/ \ますたー/
Merged mastodon/mastodon at a4ec187a203f52dd2fe0bdeb90e9d950a216b107.