Will Marshall f7c71568df Merge branch 'laura_and_will' ...

Conflicts:
	app/models/spree/variant_decorator.rb
	db/schema.rb
	spec/models/spree/product_spec.rb
	spec/models/spree/variant_spec.rb

2014-06-13 12:42:14 +10:00

..

admin

Admin UI soft-deletes variants, not hard delete

2014-06-12 14:59:27 +10:00

consumer

Smooth scrolling, svg support via directive

2014-06-13 11:00:28 +10:00