mirror of https://github.com/tootsuite/mastodon
65e994b29b
Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours. |
||
|---|---|---|
| .. | ||
| 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 | ||
| tags | ||