Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `config/i18n-tasks.yml`: Upstream added new ignored strings, glitch-soc has extra ignored strings because of the theming system. Added upstream's changes.
This commit is contained in:
@@ -65,9 +65,11 @@ ignore_unused:
|
||||
- 'errors.429'
|
||||
- 'admin.accounts.roles.*'
|
||||
- 'admin.action_logs.actions.*'
|
||||
- 'themes.*'
|
||||
- 'admin.reports.summary.action_preambles.*'
|
||||
- 'admin.reports.summary.actions.*'
|
||||
- 'admin_mailer.new_appeal.actions.*'
|
||||
- 'statuses.attached.*'
|
||||
- 'themes.*'
|
||||
- 'move_handler.carry_{mutes,blocks}_over_text'
|
||||
- 'notification_mailer.*'
|
||||
|
||||
|
||||
Reference in New Issue
Block a user