mirror of
https://github.com/mastodon/mastodon.git
synced 2025-01-19 00:21:40 +01:00
12dae9d583
Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml