Conflicts: - `tsconfig.json`: Upstream made style fixes, while glitch-soc had extra options. Ported upstream's style fixes. |
||
|---|---|---|
| .. | ||
| components | ||
| containers | ||
| util | ||
| index.jsx | ||
Conflicts: - `tsconfig.json`: Upstream made style fixes, while glitch-soc had extra options. Ported upstream's style fixes. |
||
|---|---|---|
| .. | ||
| components | ||
| containers | ||
| util | ||
| index.jsx | ||