Claire 443ec4f8ba Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/tags/index.html.haml`: Removed upstream while it had changes in glitch-soc to accomodate for the theming system. Additional changes to accomodate for the theming system: - `app/views/admin/trends/links/preview_card_providers/index.html.haml` - `app/views/admin/trends/links/index.html.haml` - `app/views/admin/trends/tags/index.html.haml` - `app/views/admin/tags/show.html.haml`		2021-11-25 23:50:35 +01:00
..
account_moderation_note_policy.rb
account_policy.rb
account_warning_preset_policy.rb
announcement_policy.rb
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
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