mirror of https://github.com/Siphonay/mastodon
53b7bb9d04
Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml |
||
---|---|---|
.. | ||
assets | ||
devise | ||
generators | ||
mastodon | ||
paperclip | ||
tasks | ||
templates | ||
cli.rb |