Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream

Browse Source

Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's changes.

...

This commit is contained in:

Claire

2023-06-05 13:25:22 +02:00

parent ee771f5bad 00c222377d

commit c22fc2fa80

33 changed files with 1640 additions and 820 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

1078

yarn.lock

File diff suppressed because it is too large Load Diff