mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
53b7bb9d04
Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml |
||
---|---|---|
.. | ||
admin | ||
settings | ||
application_helper.rb | ||
flashes_helper.rb | ||
home_helper.rb | ||
instance_helper.rb | ||
jsonld_helper.rb | ||
mailer_helper.rb | ||
routing_helper.rb | ||
settings_helper.rb | ||
stream_entries_helper.rb |