Miles Gould 4701bd1b2e Merge branch 'dev' into places2 ...

Conflicts:
	Gemfile.lock
	config/application.rb
	credentials.example

2013-08-31 15:49:30 +01: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

…

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

…

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

…