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

Conflicts:
	spec/features/consumer/checkout_spec.rb

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

..

assets

Merge branch 'move-save-checkout-button'

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

controllers

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

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

helpers

Feature toggle order cycles.

2013-07-23 15:57:43 +10:00

mailers

Move strip_html to main app, fixes context-sensitive chili feature spec fail

2013-07-22 16:21:32 +10:00

models

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

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

overrides

Merge branch 'move-save-checkout-button'

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

presenters

Simplify exchange products/variants JSON output format, bind angular to this

2013-01-10 10:59:53 +11:00

views

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

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