David Yip a6fb1c58ee Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb		2018-02-04 16:36:19 -06:00
..
migrate	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-02-04 16:36:19 -06:00
schema.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-02-04 16:36:19 -06:00
seeds.rb	Fix db:seed - only run some validations when the field was changed (#3592)	2017-06-08 09:22:01 -04:00