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
David Yip 991371af5f
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
	db/schema.rb
7 years ago
..
migrate Merge remote-tracking branch 'origin/master' into merge-upstream 7 years ago
schema.rb Merge remote-tracking branch 'origin/master' into merge-upstream 7 years ago
seeds.rb Fix db:seed - only run some validations when the field was changed (#3592) 8 years ago