mirror of https://github.com/tootsuite/mastodon
f8e07ca5cd
Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other). |
||
|---|---|---|
| .. | ||
| account_moderation_notes | ||
| accounts | ||
| action_logs | ||
| change_emails | ||
| custom_emojis | ||
| dashboard | ||
| domain_blocks | ||
| email_domain_blocks | ||
| instances | ||
| invites | ||
| relays | ||
| report_notes | ||
| reports | ||
| settings | ||
| statuses | ||
| subscriptions | ||
| suspensions | ||