mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-09 00:12:13 -05:00
Conflicts: app/controllers/invites_controller.rb app/serializers/initial_state_serializer.rb config/locales/ko.yml
Conflicts: app/controllers/invites_controller.rb app/serializers/initial_state_serializer.rb config/locales/ko.yml