Brenda Wallace 8fb4725f46 Merge remote-tracking branch 'upstream/dev' into api-docs ...

Conflicts:
	app/resources/api/v1/planting_resource.rb

2019-11-18 10:26:05 +13:00

..

assets

Fix alt on img tag

2019-11-16 22:32:45 +13:00

controllers

Fix markers on crops#show map

2019-11-16 11:35:45 +13:00

helpers

Tidy up indexes and add links to data/api

2019-11-18 10:23:07 +13:00

jobs

Application job for Rails 5

2018-01-03 17:20:08 +13:00

mailers

polish up the plantings reminders

2019-10-20 14:12:34 +13:00

models

Update spec for api resource

2019-11-16 13:05:40 +13:00

resources

Merge remote-tracking branch 'upstream/dev' into api-docs

2019-11-18 10:26:05 +13:00

services

👩‍🌾 Import openfarm data (#2177)

2019-09-28 17:23:25 +12:00

validators

Rubocop style fix ups

2018-06-04 16:18:49 +12:00

views

Merge remote-tracking branch 'upstream/dev' into api-docs

2019-11-18 10:26:05 +13:00