Claire 954e052b07 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/media_attachment.rb`:
  Upstream moved hardcoded values around, while in glitch-soc they are
  configurable.
  Moved them like upstream, but keeping glitch-soc's ability to configure
  them through env vars.
2022-02-22 18:06:29 +01:00
..
2022-02-14 21:27:53 +01:00
2021-11-25 13:07:38 +01:00
2017-04-11 01:11:41 +02:00
2022-02-14 21:27:53 +01:00