1
0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-30 03:23:01 -05:00
Claire f1a6f9062e Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Upstream moved things around in a place where glitch-soc had support for
  an extra parameter (`content_type`).
  Follow upstream but reintroduce `content_type`.
2022-02-10 19:09:27 +01:00
..
2021-02-11 06:22:11 +01:00