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

..

account_actions

…

account_moderation_notes

…

account_warnings

…

accounts

Merge branch 'main' into glitch-soc/merge-upstream

2022-01-16 18:11:20 +01:00

action_logs

Merge branch 'main' into glitch-soc/merge-upstream

2022-01-17 10:45:25 +01:00

announcements

…

change_emails

…

custom_emojis

…

dashboard

Merge branch 'main' into glitch-soc/merge-upstream

2021-12-16 16:20:44 +01:00

domain_allows

…

domain_blocks

…

email_domain_blocks

…

follow_recommendations

Merge branch 'main' into glitch-soc/merge-upstream

2021-07-08 16:17:19 +02:00

instances

Add ability to purge undeliverable domains from admin interface (#16686)

2021-12-17 23:01:21 +01:00

invites

…

ip_blocks

Merge branch 'main' into glitch-soc/merge-upstream

2021-12-16 16:20:44 +01:00

relationships

…

relays

…

report_notes

Add notifications for statuses deleted by moderators (#17204)

2022-01-17 09:41:33 +01:00

reports

Merge branch 'main' into glitch-soc/merge-upstream

2022-01-17 10:45:25 +01:00

rules

…

settings

Merge branch 'main' into glitch-soc/merge-upstream

2021-11-26 22:53:55 +01:00

statuses

Merge branch 'main' into glitch-soc/merge-upstream

2022-01-17 10:45:25 +01:00

tags

Merge branch 'main' into glitch-soc/merge-upstream

2021-11-25 23:50:35 +01:00

trends

Merge branch 'main' into glitch-soc/merge-upstream

2021-11-26 01:15:32 +01:00

warning_presets

…