mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-14 03:32:56 -05:00
f1a6f9062e
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`.