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

Conflicts:
	app/models/harvest.rb
	db/schema.rb
	spec/models/harvest_spec.rb

2014-10-15 14:20:16 +01:00

..

assets

Moving development to top level directory

2012-08-23 10:41:00 -07:00

haml/filters

Added crops-posts association as well as updated GUI for crop show

2014-10-05 13:32:08 +11:00

tasks

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

2014-10-15 14:20:16 +01:00

geocodable.rb

Added various fields to garden

2013-10-25 21:54:13 +11:00