Jennifer Kruse 296daa7a56 Merge branch 'dev' into SecondCommentButton

2018-04-18 20:47:53 -05:00

..

assets

Fixing various wrapping issues

2018-04-07 14:58:07 -05:00

controllers

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

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

helpers

Style fix

2018-04-08 10:04:43 +12:00

mailers

Revert "Auto corrected by following Style/StringLiterals"

2018-02-09 07:58:47 +13:00

models

Merge branch 'dev' into feature/ownable

2018-04-03 08:46:34 +12:00

resources/api/v1

Request spec for photos api

2017-11-17 22:01:37 +13:00

services

Revert "Auto corrected by following Style/StringLiterals"

2018-02-09 07:58:47 +13:00

validators

Use guard clauses

2016-12-14 21:28:35 +00:00

views

Merge branch 'dev' into SecondCommentButton

2018-04-18 20:47:53 -05:00