masto-fe/db
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
..
migrate Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
post_migrate Merge branch 'main' into glitch-soc/merge-upstream 2022-01-23 18:24:01 +01:00
views Fix some old migration scripts (#17394) 2022-01-30 21:38:54 +01:00
schema.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
seeds.rb Change unconfirmed user login behaviour (#11375) 2019-07-22 10:48:50 +02:00