mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-13 19:54:01 -05:00
53b7bb9d04
Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web | ||
base_controller_spec.rb | ||
oembed_controller_spec.rb | ||
push_controller_spec.rb | ||
salmon_controller_spec.rb | ||
subscriptions_controller_spec.rb |