Claire f224237862 Merge branch 'main' into glitch-soc/merge-upstream
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.
2022-02-17 10:58:44 +01:00
..
2019-09-29 21:31:51 +02:00
2020-10-12 16:33:49 +02:00
2020-06-02 19:24:53 +02:00
2022-01-16 22:26:18 +01:00