nyastodon/db
Claire b3bf32a21e Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/reports/show.html.haml`:
  Conflicts due to glitch-soc's theming system.
2022-01-17 10:45:25 +01:00
..
migrate Merge branch 'main' into glitch-soc/merge-upstream 2022-01-17 10:45:25 +01:00
post_migrate Merge branch 'main' into glitch-soc/merge-upstream 2022-01-17 10:45:25 +01:00
views Remove IP tracking columns from users table (#16409) 2022-01-16 13:23:50 +01:00
schema.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-01-17 10:45:25 +01:00
seeds.rb Change unconfirmed user login behaviour (#11375) 2019-07-22 10:48:50 +02:00