63969b15b3
Conflicts: - `app/models/form/admin_settings.rb`: Upstream added the notion of overriden settings, while we had extra code for pseudo-settings (only used to combine flavour and skin in a single select field). Ported upstream changes. - `config/i18n-tasks.yml`: Upstream added `simple_form.overridden` to `ignore_unused`, we had `simple_form.glitch_only`. Added `simple_form.glitch_only` as well. |
||
|---|---|---|
| .. | ||
| account_batch.rb | ||
| admin_settings.rb | ||
| challenge.rb | ||
| custom_emoji_batch.rb | ||
| delete_confirmation.rb | ||
| domain_block_batch.rb | ||
| email_domain_block_batch.rb | ||
| import.rb | ||
| ip_block_batch.rb | ||
| redirect.rb | ||
| status_filter_batch_action.rb | ||
| two_factor_confirmation.rb | ||