Rohan Mitchell 29235cd2cb Merge branch 'master' into product-amount-units ...

Conflicts:
	app/assets/javascripts/admin/bulk_product_update.js.coffee
	spec/spec_helper.rb

2014-01-14 15:34:05 +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

Fix product lists not matching when saving changes to product unit+values fields

2014-01-10 15:43:45 +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 product-amount-units

2014-01-14 15:34:05 +11:00

seeds.rb

Fixed the finder ('all' finder was used in seed test instead of singular one).

2013-08-07 19:24:57 +10:00

suburb_seeds.rb

Update rake task for product distribution fees by enterprise fee

2013-08-13 09:11:25 +10:00