mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-13 14:45:12 +01:00
f4b2478af1
Conflicts: app/views/layouts/mailer.html.haml config/locales/ko.yml |
||
---|---|---|
.. | ||
assets | ||
json_ld | ||
mastodon | ||
paperclip | ||
tasks | ||
templates/haml/scaffold |