Brenda Wallace 38e36c4a2c Merge remote-tracking branch 'upstream/dev' into cache/harvests ...

Conflicts:
	.rubocop_todo.yml
	app/controllers/likes_controller.rb
	app/models/concerns/crop_search.rb
	app/services/crop_search_service.rb

2019-12-19 10:28:17 +13:00

..

migrate

Merge remote-tracking branch 'upstream/dev' into cache/harvests

2019-12-19 10:28:17 +13:00

seeds

Removed all trailing white space

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

schema.rb

Counter cache for posts

2019-12-10 20:30:57 +13:00

seeds.rb

Rubocop update (#2334)

2019-12-16 22:35:33 +13:00