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

Browse Source

Conflicts:
- `db/schema.rb`:
  Upstream re-generated the file, which reordered all the definitions.
  Re-generated the files as well.

...

This commit is contained in:

Claire committed 2026-03-04 18:39:00 +01:00

2 parents 96e4d1d821 a89754f288

commit 8d836e0a49

1 file changed

+480 -479

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

db/schema.rb

+480 -479

File diff suppressed because it is too large. Load diff