mirror of https://github.com/tootsuite/mastodon
16ff7c5627
Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb |
||
|---|---|---|
| .. | ||
| 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 | ||