Claire 9a3d91f629 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `app/models/concerns/domain_materializable.rb`:
  Fixed a code style issue upstream in a PR that got merged in glitch-soc
  earlier.
  Changed the code to match upstream's.

2022-12-07 09:03:42 +01:00

4.3 KiB

Raw Blame History

View Raw