mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-05 04:55:05 +00:00
b481e4fac1
Conflicts: config/locales/simple_form.ja.yml |
||
---|---|---|
.. | ||
assets | ||
devise | ||
mastodon | ||
paperclip | ||
tasks | ||
templates/haml/scaffold |