Miles Gould b7cbadf84a Merge branch 'dev' into seed_trade ...

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

2013-07-23 12:59:41 +01:00

..

migrate

added slug for seeds

2013-07-23 21:14:24 +10:00

seeds

Fixed tests by getting rid of valid_session

2012-11-26 19:04:43 +11:00

schema.rb

Merge branch 'dev' into seed_trade

2013-07-23 12:59:41 +01:00

seeds.rb

Cleaned up seeds.rb, added methods etc.

2013-07-09 21:02:01 +10:00