mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-09 08:25:55 +00:00
bb6988a7ac
# Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb |
||
---|---|---|
.. | ||
account_moderation_note_policy.rb | ||
account_policy.rb | ||
application_policy.rb | ||
backup_policy.rb | ||
custom_emoji_policy.rb | ||
domain_block_policy.rb | ||
email_domain_block_policy.rb | ||
instance_policy.rb | ||
invite_policy.rb | ||
report_policy.rb | ||
settings_policy.rb | ||
status_policy.rb | ||
subscription_policy.rb | ||
user_policy.rb |