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_actions | ||
| account_moderation_notes | ||
| account_warnings | ||
| accounts | ||
| action_logs | ||
| change_emails | ||
| custom_emojis | ||
| dashboard | ||
| domain_allows | ||
| domain_blocks | ||
| email_domain_blocks | ||
| followers | ||
| instances | ||
| invites | ||
| pending_accounts | ||
| relays | ||
| report_notes | ||
| reports | ||
| settings | ||
| statuses | ||
| tags | ||
| warning_presets | ||