Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream

Browse Source

Conflicts:
- `db/schema.rb`:
  Upstream regenerated the schema file using Rails 7, the conflicts are
  caused by our extra columns.
  Applied upstream's changes, but keeping our extra columns.

...

This commit is contained in:

Claire

2023-07-30 14:58:56 +02:00

parent 09ebf7e37c ce1f35d7e2

commit bd349cb850

172 changed files with 749 additions and 652 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

432

db/schema.rb

File diff suppressed because it is too large Load Diff