mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-17 02:45:59 +00:00
f9d000ebae
Conflicts: - `app/services/resolve_url_service.rb`: The private toot search by URL hack has been revamped upstream. Took upstream's version. |
||
---|---|---|
.. | ||
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 | ||
domain_allow_policy.rb | ||
domain_block_policy.rb | ||
email_domain_block_policy.rb | ||
instance_policy.rb | ||
invite_policy.rb | ||
ip_block_policy.rb | ||
poll_policy.rb | ||
relay_policy.rb | ||
report_note_policy.rb | ||
report_policy.rb | ||
settings_policy.rb | ||
status_policy.rb | ||
tag_policy.rb | ||
user_policy.rb |