mirror of https://github.com/mastodon/mastodon
It was merge when it needed to be deep_merge. And added some tests |
7 years ago | |
---|---|---|
.. | ||
v1 | 7 years ago | |
web | 7 years ago | |
base_controller_spec.rb | 8 years ago | |
oembed_controller_spec.rb | 8 years ago | |
push_controller_spec.rb | 8 years ago | |
salmon_controller_spec.rb | 7 years ago | |
subscriptions_controller_spec.rb | 8 years ago |