You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Yip 2b43b1ab6b db/schema.rb: resolve erroneously-unresolved conflict		7 years ago
..
migrate	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
schema.rb	db/schema.rb: resolve erroneously-unresolved conflict	7 years ago
seeds.rb	Fix db:seed - only run some validations when the field was changed (#3592)	7 years ago