mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-04 22:14:34 +00: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. |
||
|---|---|---|
| .. | ||
| account_batch.rb | ||
| admin_settings.rb | ||
| delete_confirmation.rb | ||
| migration.rb | ||
| status_batch.rb | ||
| two_factor_confirmation.rb | ||