e4f8679eae
Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it. |
||
|---|---|---|
| .. | ||
| 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 | ||