• Claire's avatar
    Merge branch 'main' into glitch-soc/merge-upstream · 9a3d91f6
    Claire authored
    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.
    9a3d91f6