Merge branch 'main' into glitch-soc/merge-upstream

Browse Source

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`

...

This commit is contained in:

Claire

2022-05-04 19:15:50 +02:00

parent 58ac5ae643 8c644dcbd9

commit c85c3fb708

12 changed files with 820 additions and 703 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1299

yarn.lock

File diff suppressed because it is too large Load Diff