Skud 1c34d428f2 Merge branch 'crop-search' of https://github.com/Skud/growstuff into Skud-crop-search ...

Conflicts:
	spec/models/crop_spec.rb

2014-04-29 11:16:20 +10:00

..

admin

…

account_types_controller_spec.rb

…

accounts_controller_spec.rb

…

admin_controller_spec.rb

…

authentications_controller_spec.rb

…

comments_controller_spec.rb

…

crops_controller_spec.rb

…

forums_controller_spec.rb

…

gardens_controller_spec.rb

…

harvests_controller_spec.rb

…

home_controller_spec.rb

…

member_controller_spec.rb

…

notifications_controller_spec.rb

…

order_items_controller_spec.rb

…

orders_controller_spec.rb

…

photos_controller_spec.rb

…

places_controller_spec.rb

…

plant_parts_controller_spec.rb

…

plantings_controller_spec.rb

…

posts_controller_spec.rb

…

products_controller_spec.rb

…

registrations_controller_spec.rb

…

roles_controller_spec.rb

…

scientific_names_controller_spec.rb

…

seeds_controller_spec.rb

…

shop_controller_spec.rb

…