Claire ce12934f5b Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `package.json`:
  Upstream removed a dependency that was textually close to a glitch-soc-only
  dependency.
  Removed the dependency as upstream did, while keeping the glitch-soc-only
  dependency.

2023-04-09 11:45:08 +02:00

1.8 KiB

Raw Blame History

View Raw