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 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/media_attachment.rb
7 years ago
..
migrate Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
post_migrate Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
schema.rb Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
seeds.rb Admission-based registrations mode (#10250) 7 years ago