Rohan Mitchell 1531c476e3 Merge branch 'master' into require_standard_variant ...

Conflicts:
	spec/controllers/spree/admin/variants_controller_spec.rb

2015-05-08 13:45:31 +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

Merge branch 'master' into require_standard_variant

2015-05-08 13:45:31 +10:00

sanitize_data.rb

Add script to sanitize order and user data.

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

schema.rb

Ensure that producer properties have a position

2015-04-24 13:05:01 +10:00

seeds.rb

Remove landing page images

2014-07-17 14:26:46 +10:00

suburb_seeds.rb

fix suburb typo

2014-09-14 12:27:24 +10:00