mirror of
https://github.com/mastodon/mastodon.git
synced 2025-02-08 18:28:26 +01:00
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`.