Brenda Wallace f8a404a88b Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 ...

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/crop.rb
	app/models/forum.rb
	app/models/photo.rb
	app/models/planting.rb
	app/models/seed.rb
	db/schema.rb
	spec/models/garden_spec.rb
	spec/models/planting_spec.rb

2018-04-28 21:25:06 +12:00

..

migrate

Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5

2018-04-28 21:25:06 +12:00

seeds

Removed all trailing white space

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

schema.rb

Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5

2018-04-28 21:25:06 +12:00

seeds.rb

Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5

2018-04-02 10:59:13 +12:00