Rohan Mitchell 16741598fd Merge branch 'master' into products-caching ...

Conflicts:
	spec/features/admin/variant_overrides_spec.rb

2016-03-18 09:59:56 +11: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 products-caching

2016-03-18 09:59:56 +11:00

sanitize_data.rb

Add script to sanitize order and user data.

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

schema.rb

Merge branch 'master' into products-caching

2016-03-18 09:59:56 +11:00

seeds.rb

Removing Suburbs from the code

2015-12-04 10:37:55 +11:00