87517e2dd8
Conflicts: app/views/layouts/mailer.html.haml config/locales/ko.yml |
||
---|---|---|
.. | ||
core | ||
flavours | ||
fonts | ||
images | ||
locales | ||
mastodon | ||
packs | ||
skins/vanilla/win95 | ||
styles |
87517e2dd8
Conflicts: app/views/layouts/mailer.html.haml config/locales/ko.yml |
||
---|---|---|
.. | ||
core | ||
flavours | ||
fonts | ||
images | ||
locales | ||
mastodon | ||
packs | ||
skins/vanilla/win95 | ||
styles |