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

Browse Source

Conflicts:
- `package.json`:
  Not really a conflict, upstream updated a dependency textually adjacent to a
  glitch-soc-only one.
  Updated the dependency as upstream did.

...

This commit is contained in:

Claire

2022-05-11 09:37:48 +02:00

parent e8b8ac8908 95555f15b5

commit 5fd8780b14

41 changed files with 916 additions and 754 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

778

yarn.lock

File diff suppressed because it is too large Load Diff