mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-04 04:24:26 +00:00
12dae9d583
Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml |
||
---|---|---|
.. | ||
assets | ||
devise | ||
generators | ||
json_ld | ||
mastodon | ||
paperclip | ||
tasks | ||
templates | ||
cli.rb |