Rohan Mitchell 3982b2a690 Merge branch 'new-spree' ...

Conflicts:
	Gemfile.lock

2013-02-20 15:24:27 +11: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

Added down method to remove_display_on_from_payment_methods migration

2013-02-07 22:54:07 +11:00

sanitize_data.rb

Add script to sanitize order and user data.

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

schema.rb

Upgrade database to Spree 1.3

2013-02-07 15:58:15 +11:00

seeds.rb

Rename Enterprise is_supplier scope to is_primary_producer

2012-11-01 15:02:57 +11:00