mirror of
https://github.com/mastodon/mastodon.git
synced 2025-01-10 04:06:27 +01:00
fcbe8982e5
# Conflicts: # app/controllers/api/v1/statuses/translations_controller.rb # app/services/translate_status_service.rb