Conflicts: - `app/models/form/admin_settings.rb`: Upstream changed code style change, including on a line modified by glitch-soc. Kept glitch-soc's line but with the code style change applied. |
||
|---|---|---|
| .. | ||
| ISSUE_TEMPLATE | ||
| actions | ||
| workflows | ||
| codecov.yml | ||
| renovate.json5 | ||
| stale.yml | ||
| stylelint-matcher.json | ||