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

Browse Source

Conflicts:
- `.github/dependabot.yml`:
  Upstream made changes while we have dropped this file.
  Keep the file deleted.
- `.prettierignore`:
  Upstream made changes at the end of the file, where we
  had our extra lines.
  Just moved our extra lines back at the end.
- `app/serializers/initial_state_serializer.rb`:
  Upstream code style changes.
  Applied them.
- `app/services/backup_service.rb`:
  Upstream code style changes.
  Applied them.

...

This commit is contained in:

Claire

2023-02-19 10:42:55 +01:00

parent 4c68189d2b fef6c59b3a

commit 7452a95998

391 changed files with 6713 additions and 3145 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

800

yarn.lock

File diff suppressed because it is too large Load Diff