Claire 6ab5b9c790 Merge commit 'a9643cb7e77fd345b48877ed958d406403ad1b46' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-nightly.yml`: We had modified the file to disable the custom ARM64 builder. Upstream has removed it, using github's runners. Took upstream's changes. - `.github/workflows/build-push-pr.yml`: We had modified the file to disable the custom ARM64 builder. Upstream has removed it, using github's runners. Took upstream's changes. - `.github/workflows/build-releases.yml`: We had modified the file to disable the custom ARM64 builder. Upstream has removed it, using github's runners. Took upstream's changes. - `.github/workflows/build-security.yml`: We had modified the file to disable the custom ARM64 builder. Upstream has removed it, using github's runners. Took upstream's changes.		2025-02-05 18:21:36 +01:00
..
disputes	…
reports	…
settings	…
terms_of_service	…
trends	…
users	…
webhooks	…
account_actions_controller.rb	…
account_moderation_notes_controller.rb	…
accounts_controller.rb	…
action_logs_controller.rb	…
announcements_controller.rb	…
base_controller.rb	…
change_emails_controller.rb	…
confirmations_controller.rb	…
custom_emojis_controller.rb	…
dashboard_controller.rb	…
domain_allows_controller.rb	…
domain_blocks_controller.rb	…
email_domain_blocks_controller.rb	…
export_domain_allows_controller.rb	…
export_domain_blocks_controller.rb	…
follow_recommendations_controller.rb	…
instances_controller.rb	…
invites_controller.rb	…
ip_blocks_controller.rb	…
relationships_controller.rb	…
relays_controller.rb	…
report_notes_controller.rb	…
reports_controller.rb	…
resets_controller.rb	…
roles_controller.rb	…
rules_controller.rb	…
settings_controller.rb	…
site_uploads_controller.rb	…
software_updates_controller.rb	…
statuses_controller.rb	…
tags_controller.rb	…
terms_of_service_controller.rb	…
warning_presets_controller.rb	…
webhooks_controller.rb	…