Mackenzie Morgan 47f42d0ffa Merge branch 'dev' of gitmaco:Growstuff/growstuff into bug-#848

2016-05-27 10:22:35 -04:00

..

assets

Merge pull request #923 from maco/bug-#854

2016-05-27 12:17:10 +01:00

controllers

use CW's case statement idea

2016-05-25 15:15:09 -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 branch 'dev' of gitmaco:Growstuff/growstuff into bug-#848

2016-05-27 10:22:35 -04:00