Skip to content
  • Claire's avatar
    Merge branch 'main' into glitch-soc/merge-upstream · f2242378
    Claire authored
    Conflicts:
    - `db/schema.rb`:
      Conflict due to glitch-soc adding the `content_type` column on status edits
      and thus having a different schema version number.
      Solved by taking upstream's schema version number, as it is higher than
      glitch-soc's.
    f2242378