Claire 1665b84285 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `package.json`:
  Not really a conflict, just a glitch-soc-only dependency textually too close
  to an updated upstream one.
- `yarn.lock`:
  Not really a conflict, just a glitch-soc-only dependency textually too close
  to an updated upstream one.

2021-10-13 15:50:24 +02:00

..

about

Merge branch 'main' into glitch-soc/merge-upstream

2021-07-13 17:57:15 +02:00

statuses

Fix error when rendering public pages with media attachments (#16763)

2021-10-13 15:27:19 +02:00