mirror of
https://github.com/mastodon/mastodon.git
synced 2025-01-19 08:31:44 +01:00
f4b2478af1
Conflicts: app/views/layouts/mailer.html.haml config/locales/ko.yml