David Yip 991371af5f Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: db/schema.rb		2018-01-09 14:16:45 -06:00
..
migrate	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-09 14:16:45 -06:00
schema.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-09 14:16:45 -06:00
seeds.rb	…