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 f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/status.rb
- db/schema.rb

Both conflicts are caused by us having extra database columns.
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 Fix db/seeds.rb (#9738) 7 years ago