mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-09 16:35:48 +00:00
f4b2478af1
Conflicts: app/views/layouts/mailer.html.haml config/locales/ko.yml |
||
---|---|---|
.. | ||
loaders | ||
configuration.js | ||
development.js | ||
generateLocalePacks.js | ||
production.js | ||
shared.js | ||
test.js | ||
translationRunner.js |