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`. |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web | ||
base_controller_spec.rb | ||
oembed_controller_spec.rb |