mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-13 14:45:12 +01:00
53b7bb9d04
Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml |
||
---|---|---|
.. | ||
applications | ||
deletes | ||
exports | ||
flavours | ||
follower_domains | ||
imports | ||
migrations | ||
notifications | ||
preferences | ||
profiles | ||
shared | ||
two_factor_authentication | ||
two_factor_authentications |