Will Marshall f7c71568df Merge branch 'laura_and_will' ...

Conflicts:
	app/models/spree/variant_decorator.rb
	db/schema.rb
	spec/models/spree/product_spec.rb
	spec/models/spree/variant_spec.rb

2014-06-13 12:42:14 +10:00

..

cms_fixtures/example.com

Add base install of Comfortable Mexican Sofa

2012-10-11 10:50:36 +11:00

default/spree

Update states to match

2013-10-30 10:42:23 +11:00

migrate

Add migration to remove deleted variants from order cycles

2014-06-12 14:59:27 +10:00

sanitize_data.rb

Add script to sanitize order and user data.

2013-02-10 16:54:39 +11:00

schema.rb

Correctly designate primary_taxon_id as NOT NULL

2014-06-12 14:59:27 +10:00

seeds.rb

Fixed the finder ('all' finder was used in seed test instead of singular one).

2013-08-07 19:24:57 +10:00

suburb_seeds.rb

Update rake task for product distribution fees by enterprise fee

2013-08-13 09:11:25 +10:00