Conflicts: - `app/views/admin/custom_emojis/new.html.haml`: Conflict caused by glitch-soc having a different file size limit constant name. Updated like upstream did while keeping glitch-soc's constant name. |
||
|---|---|---|
| .. | ||
| ISSUE_TEMPLATE | ||
| actions | ||
| workflows | ||
| codecov.yml | ||
| renovate.json5 | ||
| stale.yml | ||
| stylelint-matcher.json | ||