Conflicts: - `package.json`: Upstream updated `jest`, moving its config in a separate file. This config was modified in glitch-soc, so the corresponding changes have been ported to `jest.config.js` |
||
|---|---|---|
| .. | ||
| components | ||
| containers | ||
| util | ||
| index.js | ||
Conflicts: - `package.json`: Upstream updated `jest`, moving its config in a separate file. This config was modified in glitch-soc, so the corresponding changes have been ported to `jest.config.js` |
||
|---|---|---|
| .. | ||
| components | ||
| containers | ||
| util | ||
| index.js | ||