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

Browse Source

Conflicts:
- `README.md`:
  Upstream added some documentation in the README, but our README is pretty
  different and barebone.
  Kept our README.

...

This commit is contained in:

Claire

2021-10-14 22:14:26 +02:00

parent 7aec1bc308 ec6eee96d0

commit b2eaf5562d

19 changed files with 417 additions and 464 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

763

yarn.lock

File diff suppressed because it is too large Load Diff