Skud 2b6bdeda16 Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev ...

Conflicts:
	spec/views/crops/show.html.haml_spec.rb

2013-07-23 19:35:31 +10:00

..

edit.html.haml_spec.rb

limit crop wrangling to crop wranglers

2013-03-18 17:02:22 +11:00

index.html.haml_spec.rb

added crop photos and a new placeholder image

2013-06-04 12:22:31 +10:00

index.rss.haml_spec.rb

Converting crops RSS to HAML

2013-05-24 12:22:41 +10:00

new.html.haml_spec.rb

added crop hierarchy basics

2013-05-14 23:24:06 +10:00

show.html.haml_spec.rb

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

2013-07-23 19:35:31 +10:00