mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-04 04:24:26 +00:00
12dae9d583
Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml |
||
---|---|---|
.. | ||
account_batch.rb | ||
admin_settings.rb | ||
delete_confirmation.rb | ||
migration.rb | ||
status_batch.rb | ||
two_factor_confirmation.rb |