Maikel Linke 0b4a43d77a Merge remote-tracking branch 'origin/master' into i18n-replace-strings-in-views ...

Conflicts:
	app/views/shared/menu/_cart.html.haml
	app/views/spree/order_mailer/confirm_email_for_shop.html.haml

2015-09-16 16:32:16 +10:00

..

cart_spec.rb

Removing screenshot from spec

2015-06-12 01:49:39 +08:00

checkout_auth_spec.rb

Updating spec for new Login label

2015-08-28 21:12:56 +10:00

checkout_spec.rb

Fix tax-related spec failures

2015-04-17 14:46:32 +10:00

shopping_spec.rb

When cart clear is declined, revert order cycle selection change

2015-07-31 16:56:08 +10:00

variant_overrides_spec.rb

Restoring all changes of the last combined branch

2015-09-10 15:03:13 +10:00