mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-13 15:58:50 +00:00
235037a3b2
Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict because upstream added a parameter where glitch-soc had an extra one. Added upstream's parameter while keeping glitch-soc's. - `app/serializers/activitypub/note_serializer.rb`: Conflict because upstream added an extension where glitch-soc had an extra one. Added upstream's extension while keeping glitch-soc's. - `app/services/update_status_service.rb`: Conflict because upstream added a parameter where glitch-soc had an extra one. Added upstream's parameter while keeping glitch-soc's.