mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-17 04:13:01 +00:00
c48ec9cb8c
Conflicts: - `config/initializers/content_security_policy.rb`: Kept our version, it was not affected by upstream's bug. |
||
---|---|---|
.. | ||
admin | ||
account_moderation_note_policy_spec.rb | ||
account_policy_spec.rb | ||
account_warning_preset_policy_spec.rb | ||
announcement_policy_spec.rb | ||
appeal_policy_spec.rb | ||
backup_policy_spec.rb | ||
canonical_email_block_policy_spec.rb | ||
custom_emoji_policy_spec.rb | ||
delivery_policy_spec.rb | ||
domain_block_policy_spec.rb | ||
email_domain_block_policy_spec.rb | ||
follow_recommendation_policy_spec.rb | ||
instance_policy_spec.rb | ||
invite_policy_spec.rb | ||
ip_block_policy_spec.rb | ||
preview_card_policy_spec.rb | ||
preview_card_provider_policy_spec.rb | ||
relay_policy_spec.rb | ||
report_note_policy_spec.rb | ||
report_policy_spec.rb | ||
rule_policy_spec.rb | ||
settings_policy_spec.rb | ||
status_policy_spec.rb | ||
tag_policy_spec.rb | ||
user_policy_spec.rb | ||
webhook_policy_spec.rb |