Brenda Wallace f4e87a974d Merge remote-tracking branch 'origin/timeline' into upgrade/rails-5 ...

Conflicts:
	app/views/gardens/show.html.haml
	spec/controllers/photo_associations_controller_spec.rb

2018-01-11 16:10:36 +13:00

..

migrate

Migrations need to specify a version

2018-01-04 14:42:25 +13:00

seeds

…

schema.rb

Migrations need to specify a version

2018-01-04 14:42:25 +13:00

seeds.rb

Merge remote-tracking branch 'origin/timeline' into upgrade/rails-5

2018-01-11 16:10:36 +13:00