Glitch-Shrike/app/views/admin
Claire 44a5f1b64a Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream
Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
- `README.md`:
  Upstream updated its README, but glitch-soc has a completely different one.
  Kept glitch-soc's README
2023-08-11 22:15:41 +02:00
..
account_actions
account_warnings
accounts Merge branch 'main' into glitch-soc/merge-upstream 2023-07-19 07:35:51 +02:00
action_logs
announcements Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream 2023-07-30 14:33:28 +02:00
change_emails
custom_emojis Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream 2023-07-30 16:11:55 +02:00
dashboard
disputes/appeals
domain_allows
domain_blocks Merge branch 'main' into glitch-soc/merge-upstream 2023-07-17 19:02:23 +02:00
email_domain_blocks
export_domain_allows
export_domain_blocks
follow_recommendations
instances Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream 2023-08-11 22:15:41 +02:00
invites
ip_blocks Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream 2023-07-30 14:33:28 +02:00
relationships
relays Update haml-lint 0.49.1 (#26118) 2023-07-23 17:48:16 +02:00
report_notes
reports Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream 2023-07-30 13:15:01 +02:00
roles Update haml-lint 0.49.1 (#26118) 2023-07-23 17:48:16 +02:00
rules
settings Merge branch 'main' into glitch-soc/merge-upstream 2023-07-19 07:35:51 +02:00
status_edits
statuses
tags
trends
users/roles
warning_presets
webhooks