mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-21 04:39:23 +00:00
07eb31eeac
Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change. |
||
|---|---|---|
| .. | ||
| account_moderation_note_policy.rb | ||
| account_policy.rb | ||
| account_warning_preset_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 | ||
| poll_policy.rb | ||
| relay_policy.rb | ||
| report_note_policy.rb | ||
| report_policy.rb | ||
| settings_policy.rb | ||
| status_policy.rb | ||
| subscription_policy.rb | ||
| tag_policy.rb | ||
| user_policy.rb | ||