You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 0437d70628 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/follower_accounts_controller.rb`: Conflict due to upstream changing suspension logic while glitch-soc has an extra option to hide followers count. Ported upstream changes.		4 years ago
..
account_moderation_note_policy_spec.rb	…
account_policy_spec.rb	Add support for reversible suspensions through ActivityPub (#14989)	4 years ago
backup_policy_spec.rb	…
custom_emoji_policy_spec.rb	…
domain_block_policy_spec.rb	…
email_domain_block_policy_spec.rb	…
instance_policy_spec.rb	…
invite_policy_spec.rb	…
relay_policy_spec.rb	…
report_note_policy_spec.rb	…
report_policy_spec.rb	…
settings_policy_spec.rb	…
status_policy_spec.rb	…
tag_policy_spec.rb	Change admin UI for hashtags and add back whitelisted trends (#11490)	5 years ago
user_policy_spec.rb	…