Claire c118918520 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/custom_emoji.rb`: Not a real conflict, just upstream changing a line too close to a glitch-soc-specific validation. Applied upstream changes. - `app/models/public_feed.rb`: Not a real conflict, just upstream changing a line too close to a glitch-soc-specific parameter documentation. Applied upstream changes.		2022-11-10 09:36:47 +01:00
..
admin
account_moderation_note_policy.rb
account_policy.rb
account_warning_policy.rb
account_warning_preset_policy.rb
announcement_policy.rb
appeal_policy.rb
application_policy.rb
audit_log_policy.rb
backup_policy.rb
canonical_email_block_policy.rb
custom_emoji_policy.rb
dashboard_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
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
tag_policy.rb
user_policy.rb
user_role_policy.rb
webhook_policy.rb