mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-18 12:52:52 +00:00
12dae9d583
Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml |
||
---|---|---|
.. | ||
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 |