Claire f224237862 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `db/schema.rb`: Conflict due to glitch-soc adding the `content_type` column on status edits and thus having a different schema version number. Solved by taking upstream's schema version number, as it is higher than glitch-soc's.		2022-02-17 10:58:44 +01:00
..
account_moderation_note_policy.rb
account_policy.rb	Add ability for admins to delete canonical email blocks (#16644)	2021-12-17 23:02:14 +01:00
account_warning_policy.rb	Fix issues when attempting to appeal an old strike (#17554)	2022-02-16 22:29:48 +01:00
account_warning_preset_policy.rb
announcement_policy.rb
appeal_policy.rb	Add appeals (#17364)	2022-02-14 21:27:53 +01:00
application_policy.rb
backup_policy.rb
custom_emoji_policy.rb
delivery_policy.rb
domain_allow_policy.rb
domain_block_policy.rb
email_domain_block_policy.rb
follow_recommendation_policy.rb
instance_policy.rb	Add ability to purge undeliverable domains from admin interface (#16686)	2021-12-17 23:01:21 +01:00
invite_policy.rb
ip_block_policy.rb
poll_policy.rb
preview_card_policy.rb
preview_card_provider_policy.rb
relay_policy.rb
report_note_policy.rb
report_policy.rb
rule_policy.rb
settings_policy.rb
status_policy.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-10 19:09:27 +01:00
tag_policy.rb
user_policy.rb