mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-25 09:34:16 -05:00
01eaeab56d
Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system. |
||
---|---|---|
.. | ||
credentials_controller_spec.rb | ||
follower_accounts_controller_spec.rb | ||
following_accounts_controller_spec.rb | ||
lists_controller_spec.rb | ||
pins_controller_spec.rb | ||
relationships_controller_spec.rb | ||
search_controller_spec.rb | ||
statuses_controller_spec.rb |