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

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/devise/registrations/edit.html.haml

2014-08-30 17:45:19 +10:00

..

shared_examples

fix tests to match new implementation of of auto_suggest

2014-08-29 07:38:55 +10:00

adding_a_seed_spec.rb

implement auto suggest on new seed page

2014-08-24 12:02:53 +10:00

crop_wranglers_spec.rb

Fixed crop wrangler tests to not be order dependent

2014-08-29 10:38:35 +10:00

footer_spec.rb

Fixed twitter link on contact page

2014-08-25 13:41:15 +10:00

harvesting_a_crop_spec.rb

write regression spec for resource id bug when editing resource

2014-08-30 12:14:36 +10:00

planting_a_crop_spec.rb

implement auto suggest on new seed page

2014-08-24 12:02:53 +10:00

planting_reminder_spec.rb

Renamed email to planting_reminder

2014-07-20 18:54:58 +10:00