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

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

2013-08-31 15:49:30 +01:00

..

ability_spec.rb

…

account_spec.rb

…

account_type_spec.rb

…

authentication_spec.rb

…

comment_spec.rb

…

crop_spec.rb

Added plantings_count (i.e. counter_cache) to Member

2013-08-26 13:54:09 +10:00

forum_spec.rb

…

garden_spec.rb

…

member_spec.rb

Merge branch 'dev' into places2

2013-08-31 15:49:30 +01:00

notification_spec.rb

…

order_item_spec.rb

…

order_spec.rb

…

photo_spec.rb

…

planting_spec.rb

Added 'bulb' as a 'planted_from' option.

2013-08-30 15:08:23 +10:00

post_spec.rb

…

product_spec.rb

…

role_spec.rb

…

scientific_name_spec.rb

added creator to scientific names

2013-08-21 17:50:51 +10:00

seed_spec.rb

…