Rohan Mitchell fe61cddda6 Merge branch 'local-organics' ...

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/store/variables.css.scss
	app/overrides/add_feedback_script.rb
	app/views/spree/shared/_order_details_steps_data.html.erb
	db/schema.rb
	script/rails
	spec/spec_helper.rb

2013-07-23 11:40:03 +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 'local-organics'

2013-07-23 11:40:03 +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 'local-organics'

2013-07-23 11:40:03 +10:00

seeds.rb

Merge branch 'local-organics'

2013-07-23 11:40:03 +10:00