mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-24 23:01:20 +00:00
12dae9d583
Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml |
||
---|---|---|
.. | ||
bookmarks_controller.rb | ||
favourited_by_accounts_controller.rb | ||
favourites_controller.rb | ||
mutes_controller.rb | ||
pins_controller.rb | ||
reblogged_by_accounts_controller.rb | ||
reblogs_controller.rb |