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. |
||
|---|---|---|
| .. | ||
| components | ||
| containers | ||
| util | ||
| index.js | ||
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. |
||
|---|---|---|
| .. | ||
| components | ||
| containers | ||
| util | ||
| index.js | ||