1
0
mirror of https://github.com/funamitech/mastodon synced 2024-11-24 15:16:33 +09:00
YuruToot/db
Claire b2915613fb Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile.lock`:
  Upstream-updated lib textually too close to glitch-soc-only dep.
  Updated like upstream.
2022-01-28 08:58:32 +01:00
..
migrate Merge branch 'main' into glitch-soc/merge-upstream 2022-01-28 08:58:32 +01:00
post_migrate Merge branch 'main' into glitch-soc/merge-upstream 2022-01-23 18:24:01 +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-23 18:24:01 +01:00
seeds.rb Change unconfirmed user login behaviour (#11375) 2019-07-22 10:48:50 +02:00