mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-27 10:30:15 -05:00
0437d70628
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. |
||
---|---|---|
.. | ||
account_moderation_note_policy_spec.rb | ||
account_policy_spec.rb | ||
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 | ||
user_policy_spec.rb |