mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-23 15:42:34 +01:00
4bc625166e
It was merge when it needed to be deep_merge. And added some tests |
||
---|---|---|
.. | ||
credentials_controller.rb | ||
follower_accounts_controller.rb | ||
following_accounts_controller.rb | ||
lists_controller.rb | ||
relationships_controller.rb | ||
search_controller.rb | ||
statuses_controller.rb |