Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  glitch-soc change because of having changed the default number of
  available poll options.
  Applied upstream's changes while keeping glitch-soc's default number of
  poll options.
- `public/oops.png`:
  We had a minor graphics change, probably not worth diverging from upstream.
  Took upstream version.
2022-11-06 09:50:41 +01:00
..
2019-09-29 21:31:51 +02:00
2022-05-09 07:43:08 +02:00
2020-10-12 16:33:49 +02:00
2022-03-26 02:53:34 +01:00
2022-01-16 22:26:18 +01:00