Claire b3bf32a21e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/reports/show.html.haml`: Conflicts due to glitch-soc's theming system.		2022-01-17 10:45:25 +01:00
..
trends	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
account_actions_controller.rb
account_moderation_notes_controller.rb	Add notifications for statuses deleted by moderators (#17204)	2022-01-17 09:41:33 +01:00
accounts_controller.rb	Add notifications for statuses deleted by moderators (#17204)	2022-01-17 09:41:33 +01:00
action_logs_controller.rb
announcements_controller.rb
base_controller.rb
change_emails_controller.rb
confirmations_controller.rb
custom_emojis_controller.rb
dashboard_controller.rb	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
domain_allows_controller.rb
domain_blocks_controller.rb
email_domain_blocks_controller.rb
follow_recommendations_controller.rb
instances_controller.rb	Add ability to purge undeliverable domains from admin interface (#16686)	2021-12-17 23:01:21 +01:00
invites_controller.rb
ip_blocks_controller.rb
relationships_controller.rb
relays_controller.rb
report_notes_controller.rb	Add notifications for statuses deleted by moderators (#17204)	2022-01-17 09:41:33 +01:00
reports_controller.rb	Add notifications for statuses deleted by moderators (#17204)	2022-01-17 09:41:33 +01:00
resets_controller.rb
roles_controller.rb
rules_controller.rb
settings_controller.rb
sign_in_token_authentications_controller.rb
site_uploads_controller.rb
statuses_controller.rb	Add notifications for statuses deleted by moderators (#17204)	2022-01-17 09:41:33 +01:00
subscriptions_controller.rb
tags_controller.rb	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
two_factor_authentications_controller.rb
warning_presets_controller.rb