Skud 75e076cef5 Merge branch 'dev' of https://github.com/Growstuff/growstuff into tomatoes ...

Conflicts:
	spec/models/crop_spec.rb

2014-10-15 14:07:03 +01:00

..

assets

stop generating helpers, constroller specs, view specs, and javascripts

2014-09-28 21:57:05 +10:00

controllers

merging from dev

2014-10-05 13:47:12 +11:00

helpers

stop generating helpers, constroller specs, view specs, and javascripts

2014-09-28 21:57:05 +10:00

mailers

Move reply_link into a helper.

2013-05-01 23:45:07 +01:00

models

Merge branch 'dev' of https://github.com/Growstuff/growstuff into tomatoes

2014-10-15 14:07:03 +01:00

views

improved test spec, crop page and added rake task

2014-10-05 23:16:46 +11:00