mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-06 23:13:01 -05:00
48b8a1f414
Conflicts: - app/models/status.rb - app/services/remove_status_service.rb - db/schema.rb All conflicts were due to the addition of a `deleted_at` attribute to Statuses and reworked database indexes.