Claire 3160e050a9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change.		2021-07-08 16:17:19 +02: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	Add management of delivery availability in Federation settings (#15771)	2021-05-05 23:39:02 +02:00
domain_allow_policy.rb
domain_block_policy.rb
email_domain_block_policy.rb
follow_recommendation_policy.rb	Add cold-start follow recommendations (#15945)	2021-04-12 12:37:14 +02:00
instance_policy.rb
invite_policy.rb
ip_block_policy.rb
poll_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	Add ability to skip sign-in token authentication for specific users (#16427)	2021-07-08 05:31:28 +02:00