34b8346e7f
Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb |
||
|---|---|---|
| .. | ||
| account_actions_controller.rb | ||
| account_moderation_notes_controller.rb | ||
| accounts_controller.rb | ||
| action_logs_controller.rb | ||
| base_controller.rb | ||
| change_emails_controller.rb | ||
| confirmations_controller.rb | ||
| custom_emojis_controller.rb | ||
| dashboard_controller.rb | ||
| domain_blocks_controller.rb | ||
| email_domain_blocks_controller.rb | ||
| followers_controller.rb | ||
| instances_controller.rb | ||
| invites_controller.rb | ||
| pending_accounts_controller.rb | ||
| relays_controller.rb | ||
| report_notes_controller.rb | ||
| reported_statuses_controller.rb | ||
| reports_controller.rb | ||
| resets_controller.rb | ||
| roles_controller.rb | ||
| settings_controller.rb | ||
| statuses_controller.rb | ||
| subscriptions_controller.rb | ||
| tags_controller.rb | ||
| two_factor_authentications_controller.rb | ||
| warning_presets_controller.rb | ||