alexs 24d559cd3a Merge branch 'master' into landing_page ...

Conflicts:
	db/schema.rb
	db/seeds.rb

2013-08-05 17:08:39 +10:00

..

cms_fixtures/example.com

Add base install of Comfortable Mexican Sofa

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

default/spree

Added first working acceptance spec for supplier.

2012-06-09 14:41:09 +10:00

migrate

Merge branch 'master' into landing_page

2013-08-05 17:08:39 +10: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 landing_page

2013-08-05 17:08:39 +10:00

seeds.rb

Merge branch 'master' into landing_page

2013-08-05 17:08:39 +10:00