Brenda Wallace e1faedfc78 Merge branch 'dev' into planting-reminders

2019-10-20 21:36:42 +13:00

..

assets

📝 Inline editing and display tidy ups (#2200)

2019-10-08 11:06:53 +13:00

controllers

Only show companions of active plantings

2019-10-20 14:13:30 +13:00

helpers

📝 Inline editing and display tidy ups (#2200)

2019-10-08 11:06:53 +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

polish up the plantings reminders

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

resources/api/v1

Delete duplicate percentage_grown attribute

2019-07-05 10:49:29 +00: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 branch 'dev' into planting-reminders

2019-10-20 21:36:42 +13:00