mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-12 22:25:10 +01:00
a942ad3062
Conflicts: - config/locales/simple_form.ja.yml Not a real conflict, one new string was introduced in glitch and one in upstream. |
||
---|---|---|
.. | ||
core | ||
flavours | ||
fonts | ||
images | ||
locales | ||
mastodon | ||
packs | ||
skins | ||
styles |