Brenda Wallace 548bbf5e57 Merge remote-tracking branch 'upstream/dev' into renamed-photographings-associations ...

Conflicts:
	db/schema.rb

2019-07-16 12:12:16 +12:00

..

finishable.rb

Ancestry of food. Seeds -> Planting -> Seeds -> Planting (#1550)

2018-03-12 08:39:32 +13:00

likeable.rb

counter cache was on the wrong side of the relationship

2019-07-15 11:58:46 +00:00

ownable.rb

Inverse relation ships

2018-10-16 13:26:54 +13:00

photo_capable.rb

Merge remote-tracking branch 'upstream/dev' into renamed-photographings-associations

2019-07-16 12:12:16 +12:00

predict_harvest.rb

Fixed linter issue, empty line after guard clause

2018-09-13 23:10:43 +12:00

predict_planting.rb

Removed unnecesary helper wrapper

2019-02-04 22:15:18 +13:00