2a7538aeed
Conflicts: - `app/controllers/settings/preferences_controller.rb`: Upstream dropping `digest` from notifications emails while we have more notification emails settings. Removed `digest` from our list while keeping our extra settings. - `app/javascript/packs/admin.js`: Conflicts caused by glitch-soc's theming system. Applied the changes to `app/javascript/core/admin.js`. - `app/views/settings/preferences/other/show.html.haml`: Upstream removed a setting close to a glitch-soc-only setting. Applied upstream's change. |
||
|---|---|---|
| .. | ||
| account_action.rb | ||
| action_log.rb | ||
| action_log_filter.rb | ||
| appeal_filter.rb | ||
| import.rb | ||
| status_batch_action.rb | ||
| status_filter.rb | ||