mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-16 07:33:51 -05:00
Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).
Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).