Miles Gould 4fa2e273aa Merge remote-tracking branch 'origin/pr/933' into dev

2016-05-31 15:48:17 +01:00

..

assets

Merge pull request #932 from CloCkWeRX/location-not-set

2016-05-31 11:41:11 +01:00

controllers

crop approval flash alert for wranglers upon sign in

2016-05-29 16:13:21 -04:00

helpers

Display one line of description in harvest card, then go to ellipsis and put read more on next line

2016-05-26 23:08:23 -04:00

mailers

$ rubocop --only HashSyntax --auto-correct

2016-05-19 15:53:11 -04:00

models

Merge branch 'dev' into upgradegibbon

2016-05-22 16:57:38 +01:00

validators

tests back to green

2015-02-09 22:41:35 +11:00

views

Merge pull request #934 from dv2/dev

2016-05-31 15:46:27 +01:00