Brenda Wallace 178c181cf5 Merge remote-tracking branch 'upstream/dev' into bw/useless-assignments ...

Conflicts:
	app/controllers/crops_controller.rb
	app/models/crop.rb
	spec/models/scientific_name_spec.rb

2016-11-30 10:32:02 +13:00

..

migrate

merge from upstream dev

2016-11-29 09:37:25 -05:00

seeds

Removed all trailing white space

2016-11-14 15:05:32 +13:00

schema.rb

rename scientific_names.scientific_name to scientific_names.name

2016-11-28 21:57:51 -05:00

seeds.rb

Fixed all useless assignments

2016-11-26 19:36:59 +13:00