You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/db
Thibaut Girka 9c3b9d5ab9 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `.env.production.sample`:
  Upstream deleted it, I decided to keep it.
- `package.json`:
  Upstream updated a dependency textually too close to wavesurfer.js
  which has been deleted from upstream but is kept in glitch-soc for now.
5 years ago
..
migrate Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
post_migrate Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
schema.rb Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
seeds.rb Change unconfirmed user login behaviour (#11375) 6 years ago