mirror of
https://github.com/funamitech/mastodon
synced 2024-11-27 14:29:03 +09:00
9903e6beab
Conflicts: - `spec/controllers/api/v1/timelines/direct_controller_spec.rb`: `spec/controllers/api/v1/timelines` has been renamed, but we had an extra spec here for a glitch-soc-only endpoint. Kept glitch-soc's file unchanged (will port to a request spec later). |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web | ||
base_controller_spec.rb | ||
oembed_controller_spec.rb |