Rohan Mitchell dd97768947 Merge branch 'move-save-checkout-button' ...

Conflicts:
	spec/features/consumer/checkout_spec.rb

2013-07-23 17:03:00 +10:00

..

controllers

Merge branch 'master' into order-cycle-selection

2013-07-23 14:42:57 +10:00

features

Merge branch 'move-save-checkout-button'

2013-07-23 17:03:00 +10:00

helpers

Selecting an order cycle highlights valid distributor choices

2013-03-08 15:17:23 +11:00

javascripts/unit

Fix broken delete action for variants

2013-07-23 10:43:08 +10:00

lib

Merge branch 'master' into order-cycle-selection

2013-07-23 14:42:57 +10:00

models

Fix selection of itemwise shipping method that broke after the spree upgrade.

2013-07-23 15:46:07 +10:00

support

Fix selection of itemwise shipping method that broke after the spree upgrade.

2013-07-23 15:46:07 +10:00

factories.rb

Merge branch 'add-capture-order-shortcut-deface'

2013-07-23 16:55:33 +10:00

spec_helper.rb

Merge branch 'master' into order-cycle-selection

2013-07-23 14:42:57 +10:00