Miles Gould 18ccb0d9fb Merge branch 'dev' into harvest-parts ...

Conflicts:
	spec/models/harvest_spec.rb

2013-12-03 13:25:18 +00:00

..

images

Added blog and email icons

2013-08-07 13:21:26 +10:00

javascripts

rails g scaffold PlantPart...

2013-10-30 23:32:20 +00:00

stylesheets

Added a partial to display a member's location.

2013-10-29 16:22:48 +11:00