mirror of https://github.com/mastodon/mastodon.git
![]() It was merge when it needed to be deep_merge. And added some tests |
||
---|---|---|
.. | ||
v1 | ||
web | ||
base_controller_spec.rb | ||
oembed_controller_spec.rb | ||
push_controller_spec.rb | ||
salmon_controller_spec.rb | ||
subscriptions_controller_spec.rb |